<!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>[43571] trunk: Coding Standards: Upgrade WPCS to 1.0.0</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/43571">43571</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/43571","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-08-17 01:50:26 +0000 (Fri, 17 Aug 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Coding Standards: Upgrade WPCS to 1.0.0
WPCS 1.0.0 includes a bunch of new auto-fixers, which drops the number of coding standards issues across WordPress significantly. Prior to running the auto-fixers, there were 15,312 issues detected. With this commit, we now drop to 4,769 issues.
This change includes three notable additions:
- Multiline function calls must now put each parameter on a new line.
- Auto-formatting files is now part of the `grunt precommit` script.
- Auto-fixable coding standards issues will now cause Travis failures.
Fixes <a href="https://core.trac.wordpress.org/ticket/44600">#44600</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktravisyml">trunk/.travis.yml</a></li>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
<li><a href="#trunkcomposerjson">trunk/composer.json</a></li>
<li><a href="#trunkcomposerlock">trunk/composer.lock</a></li>
<li><a href="#trunkpackagelockjson">trunk/package-lock.json</a></li>
<li><a href="#trunkphpcsxmldist">trunk/phpcs.xml.dist</a></li>
<li><a href="#trunksrcindexphp">trunk/src/index.php</a></li>
<li><a href="#trunksrcwpadmin_indexphp">trunk/src/wp-admin/_index.php</a></li>
<li><a href="#trunksrcwpadminaboutphp">trunk/src/wp-admin/about.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="#trunksrcwpadmincustombackgroundphp">trunk/src/wp-admin/custom-background.php</a></li>
<li><a href="#trunksrcwpadmincustomheaderphp">trunk/src/wp-admin/custom-header.php</a></li>
<li><a href="#trunksrcwpadmineditformadvancedphp">trunk/src/wp-admin/edit-form-advanced.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="#trunksrcwpadminexportphp">trunk/src/wp-admin/export.php</a></li>
<li><a href="#trunksrcwpadminimportphp">trunk/src/wp-admin/import.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="#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="#trunksrcwpadminincludesclassthemeinstallerskinphp">trunk/src/wp-admin/includes/class-theme-installer-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclassthemeupgraderskinphp">trunk/src/wp-admin/includes/class-theme-upgrader-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclassthemeupgraderphp">trunk/src/wp-admin/includes/class-theme-upgrader.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="#trunksrcwpadminincludesclasswpinternalpointersphp">trunk/src/wp-admin/includes/class-wp-internal-pointers.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswplinkslisttablephp">trunk/src/wp-admin/includes/class-wp-links-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswplisttablephp">trunk/src/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmedialisttablephp">trunk/src/wp-admin/includes/class-wp-media-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="#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="#trunksrcwpadminincludesclasswppostcommentslisttablephp">trunk/src/wp-admin/includes/class-wp-post-comments-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppostslisttablephp">trunk/src/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpscreenphp">trunk/src/wp-admin/includes/class-wp-screen.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswptermslisttablephp">trunk/src/wp-admin/includes/class-wp-terms-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpthemeinstalllisttablephp">trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-themes-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpuserslisttablephp">trunk/src/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunksrcwpadminincludesexportphp">trunk/src/wp-admin/includes/export.php</a></li>
<li><a href="#trunksrcwpadminincludesfilephp">trunk/src/wp-admin/includes/file.php</a></li>
<li><a href="#trunksrcwpadminincludesimageeditphp">trunk/src/wp-admin/includes/image-edit.php</a></li>
<li><a href="#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="#trunksrcwpadminincludesmetaboxesphp">trunk/src/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunksrcwpadminincludesmiscphp">trunk/src/wp-admin/includes/misc.php</a></li>
<li><a href="#trunksrcwpadminincludesmsphp">trunk/src/wp-admin/includes/ms.php</a></li>
<li><a href="#trunksrcwpadminincludesnavmenuphp">trunk/src/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunksrcwpadminincludesnetworkphp">trunk/src/wp-admin/includes/network.php</a></li>
<li><a href="#trunksrcwpadminincludesoptionsphp">trunk/src/wp-admin/includes/options.php</a></li>
<li><a href="#trunksrcwpadminincludesplugininstallphp">trunk/src/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.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="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpadminincludesthemeinstallphp">trunk/src/wp-admin/includes/theme-install.php</a></li>
<li><a href="#trunksrcwpadminincludesthemephp">trunk/src/wp-admin/includes/theme.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="#trunksrcwpadminindexphp">trunk/src/wp-admin/index.php</a></li>
<li><a href="#trunksrcwpadmininstallphp">trunk/src/wp-admin/install.php</a></li>
<li><a href="#trunksrcwpadminmaintrepairphp">trunk/src/wp-admin/maint/repair.php</a></li>
<li><a href="#trunksrcwpadminmediaphp">trunk/src/wp-admin/media.php</a></li>
<li><a href="#trunksrcwpadminmsdeletesitephp">trunk/src/wp-admin/ms-delete-site.php</a></li>
<li><a href="#trunksrcwpadminmysitesphp">trunk/src/wp-admin/my-sites.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="#trunksrcwpadminnetworksiteinfophp">trunk/src/wp-admin/network/site-info.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="#trunksrcwpadminnetworksitethemesphp">trunk/src/wp-admin/network/site-themes.php</a></li>
<li><a href="#trunksrcwpadminnetworksiteusersphp">trunk/src/wp-admin/network/site-users.php</a></li>
<li><a href="#trunksrcwpadminnetworkthemesphp">trunk/src/wp-admin/network/themes.php</a></li>
<li><a href="#trunksrcwpadminnetworkupgradephp">trunk/src/wp-admin/network/upgrade.php</a></li>
<li><a href="#trunksrcwpadminnetworkusernewphp">trunk/src/wp-admin/network/user-new.php</a></li>
<li><a href="#trunksrcwpadminnetworkusersphp">trunk/src/wp-admin/network/users.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="#trunksrcwpadminoptionsreadingphp">trunk/src/wp-admin/options-reading.php</a></li>
<li><a href="#trunksrcwpadminoptionswritingphp">trunk/src/wp-admin/options-writing.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="#trunksrcwpadminpluginsphp">trunk/src/wp-admin/plugins.php</a></li>
<li><a href="#trunksrcwpadminpostphp">trunk/src/wp-admin/post.php</a></li>
<li><a href="#trunksrcwpadminpressthisphp">trunk/src/wp-admin/press-this.php</a></li>
<li><a href="#trunksrcwpadminprivacyphp">trunk/src/wp-admin/privacy.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="#trunksrcwpadmintoolsphp">trunk/src/wp-admin/tools.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="#trunksrcwpadminupgradephp">trunk/src/wp-admin/upgrade.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="#trunksrcwpcommentspostphp">trunk/src/wp-comments-post.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyeleven404php">trunk/src/wp-content/themes/twentyeleven/404.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="#trunksrcwpcontentthemestwentyelevencontentfeaturedphp">trunk/src/wp-content/themes/twentyeleven/content-featured.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="#trunksrcwpcontentthemestwentyelevencontentintrophp">trunk/src/wp-content/themes/twentyeleven/content-intro.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevencontentlinkphp">trunk/src/wp-content/themes/twentyeleven/content-link.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevencontentpagephp">trunk/src/wp-content/themes/twentyeleven/content-page.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="#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="#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="#trunksrcwpcontentthemestwentyfifteencontentpagephp">trunk/src/wp-content/themes/twentyfifteen/content-page.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="#trunksrcwpcontentthemestwentyfifteenheaderphp">trunk/src/wp-content/themes/twentyfifteen/header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfifteenimagephp">trunk/src/wp-content/themes/twentyfifteen/image.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfifteenincbackcompatphp">trunk/src/wp-content/themes/twentyfifteen/inc/back-compat.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="#trunksrcwpcontentthemestwentyfifteensearchphp">trunk/src/wp-content/themes/twentyfifteen/search.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="#trunksrcwpcontentthemestwentyfourteencommentsphp">trunk/src/wp-content/themes/twentyfourteen/comments.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentasidephp">trunk/src/wp-content/themes/twentyfourteen/content-aside.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentaudiophp">trunk/src/wp-content/themes/twentyfourteen/content-audio.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentgalleryphp">trunk/src/wp-content/themes/twentyfourteen/content-gallery.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentimagephp">trunk/src/wp-content/themes/twentyfourteen/content-image.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentlinkphp">trunk/src/wp-content/themes/twentyfourteen/content-link.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentpagephp">trunk/src/wp-content/themes/twentyfourteen/content-page.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentquotephp">trunk/src/wp-content/themes/twentyfourteen/content-quote.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentvideophp">trunk/src/wp-content/themes/twentyfourteen/content-video.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentphp">trunk/src/wp-content/themes/twentyfourteen/content.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfunctionsphp">trunk/src/wp-content/themes/twentyfourteen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenheaderphp">trunk/src/wp-content/themes/twentyfourteen/header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenimagephp">trunk/src/wp-content/themes/twentyfourteen/image.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenincbackcompatphp">trunk/src/wp-content/themes/twentyfourteen/inc/back-compat.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteeninccustomheaderphp">trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteeninccustomizerphp">trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenincfeaturedcontentphp">trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteeninctemplatetagsphp">trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenincwidgetsphp">trunk/src/wp-content/themes/twentyfourteen/inc/widgets.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenindexphp">trunk/src/wp-content/themes/twentyfourteen/index.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenpagetemplatescontributorsphp">trunk/src/wp-content/themes/twentyfourteen/page-templates/contributors.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteensearchphp">trunk/src/wp-content/themes/twentyfourteen/search.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteensidebarphp">trunk/src/wp-content/themes/twentyfourteen/sidebar.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="#trunksrcwpcontentthemestwentyseventeenarchivephp">trunk/src/wp-content/themes/twentyseventeen/archive.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeencommentsphp">trunk/src/wp-content/themes/twentyseventeen/comments.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeenfooterphp">trunk/src/wp-content/themes/twentyseventeen/footer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeenfrontpagephp">trunk/src/wp-content/themes/twentyseventeen/front-page.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeenfunctionsphp">trunk/src/wp-content/themes/twentyseventeen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeenincbackcompatphp">trunk/src/wp-content/themes/twentyseventeen/inc/back-compat.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeeninccustomheaderphp">trunk/src/wp-content/themes/twentyseventeen/inc/custom-header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeeninccustomizerphp">trunk/src/wp-content/themes/twentyseventeen/inc/customizer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeensearchphp">trunk/src/wp-content/themes/twentyseventeen/search.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeentemplatepartsfooterfooterwidgetsphp">trunk/src/wp-content/themes/twentyseventeen/template-parts/footer/footer-widgets.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeentemplatepartsheadersitebrandingphp">trunk/src/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeentemplatepartspagecontentfrontpagepanelsphp">trunk/src/wp-content/themes/twentyseventeen/template-parts/page/content-front-page-panels.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeentemplatepartspagecontentfrontpagephp">trunk/src/wp-content/themes/twentyseventeen/template-parts/page/content-front-page.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeentemplatepartspagecontentpagephp">trunk/src/wp-content/themes/twentyseventeen/template-parts/page/content-page.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeentemplatepartspostcontentnonephp">trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-none.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentysixteencommentsphp">trunk/src/wp-content/themes/twentysixteen/comments.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentysixteenfunctionsphp">trunk/src/wp-content/themes/twentysixteen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentysixteenheaderphp">trunk/src/wp-content/themes/twentysixteen/header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentysixteenimagephp">trunk/src/wp-content/themes/twentysixteen/image.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentysixteenincbackcompatphp">trunk/src/wp-content/themes/twentysixteen/inc/back-compat.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="#trunksrcwpcontentthemestwentysixteentemplatepartscontentpagephp">trunk/src/wp-content/themes/twentysixteen/template-parts/content-page.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentysixteentemplatepartscontentsinglephp">trunk/src/wp-content/themes/twentysixteen/template-parts/content-single.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentysixteentemplatepartscontentphp">trunk/src/wp-content/themes/twentysixteen/template-parts/content.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="#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="#trunksrcwpcontentthemestwentythirteencontentasidephp">trunk/src/wp-content/themes/twentythirteen/content-aside.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteencontentaudiophp">trunk/src/wp-content/themes/twentythirteen/content-audio.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteencontentchatphp">trunk/src/wp-content/themes/twentythirteen/content-chat.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteencontentgalleryphp">trunk/src/wp-content/themes/twentythirteen/content-gallery.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteencontentimagephp">trunk/src/wp-content/themes/twentythirteen/content-image.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteencontentlinkphp">trunk/src/wp-content/themes/twentythirteen/content-link.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteencontentquotephp">trunk/src/wp-content/themes/twentythirteen/content-quote.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteencontentstatusphp">trunk/src/wp-content/themes/twentythirteen/content-status.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteencontentvideophp">trunk/src/wp-content/themes/twentythirteen/content-video.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteenfunctionsphp">trunk/src/wp-content/themes/twentythirteen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteenheaderphp">trunk/src/wp-content/themes/twentythirteen/header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteenimagephp">trunk/src/wp-content/themes/twentythirteen/image.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteenincbackcompatphp">trunk/src/wp-content/themes/twentythirteen/inc/back-compat.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteeninccustomheaderphp">trunk/src/wp-content/themes/twentythirteen/inc/custom-header.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="#trunksrcwpcontentthemestwentytwelvecommentsphp">trunk/src/wp-content/themes/twentytwelve/comments.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelvecontentpagephp">trunk/src/wp-content/themes/twentytwelve/content-page.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="#trunksrcwpcontentthemestwentytwelveheaderphp">trunk/src/wp-content/themes/twentytwelve/header.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="#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="#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="#trunksrcwpincludescanonicalphp">trunk/src/wp-includes/canonical.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="#trunksrcwpincludesclassoembedphp">trunk/src/wp-includes/class-oembed.php</a></li>
<li><a href="#trunksrcwpincludesclasswalkercategoryphp">trunk/src/wp-includes/class-walker-category.php</a></li>
<li><a href="#trunksrcwpincludesclasswalkercommentphp">trunk/src/wp-includes/class-walker-comment.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizenavmenusphp">trunk/src/wp-includes/class-wp-customize-nav-menus.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizewidgetsphp">trunk/src/wp-includes/class-wp-customize-widgets.php</a></li>
<li><a href="#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="#trunksrcwpincludesclasswphttpcurlphp">trunk/src/wp-includes/class-wp-http-curl.php</a></li>
<li><a href="#trunksrcwpincludesclasswphttpstreamsphp">trunk/src/wp-includes/class-wp-http-streams.php</a></li>
<li><a href="#trunksrcwpincludesclasswpmetaqueryphp">trunk/src/wp-includes/class-wp-meta-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpoembedcontrollerphp">trunk/src/wp-includes/class-wp-oembed-controller.php</a></li>
<li><a href="#trunksrcwpincludesclasswpqueryphp">trunk/src/wp-includes/class-wp-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswprewritephp">trunk/src/wp-includes/class-wp-rewrite.php</a></li>
<li><a href="#trunksrcwpincludesclasswptaxqueryphp">trunk/src/wp-includes/class-wp-tax-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswptaxonomyphp">trunk/src/wp-includes/class-wp-taxonomy.php</a></li>
<li><a href="#trunksrcwpincludesclasswptermqueryphp">trunk/src/wp-includes/class-wp-term-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemephp">trunk/src/wp-includes/class-wp-theme.php</a></li>
<li><a href="#trunksrcwpincludesclasswpuserphp">trunk/src/wp-includes/class-wp-user.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="#trunksrcwpincludescommenttemplatephp">trunk/src/wp-includes/comment-template.php</a></li>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
<li><a href="#trunksrcwpincludescronphp">trunk/src/wp-includes/cron.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizebackgroundimagecontrolphp">trunk/src/wp-includes/customize/class-wp-customize-background-image-control.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizecustomcsssettingphp">trunk/src/wp-includes/customize/class-wp-customize-custom-css-setting.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizeheaderimagecontrolphp">trunk/src/wp-includes/customize/class-wp-customize-header-image-control.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizenavmenuitemsettingphp">trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizenavmenusettingphp">trunk/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizenavmenuspanelphp">trunk/src/wp-includes/customize/class-wp-customize-nav-menus-panel.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizethemecontrolphp">trunk/src/wp-includes/customize/class-wp-customize-theme-control.php</a></li>
<li><a href="#trunksrcwpincludesdefaultfiltersphp">trunk/src/wp-includes/default-filters.php</a></li>
<li><a href="#trunksrcwpincludesembedphp">trunk/src/wp-includes/embed.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="#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="#trunksrcwpincludesksesphp">trunk/src/wp-includes/kses.php</a></li>
<li><a href="#trunksrcwpincludesl10nphp">trunk/src/wp-includes/l10n.php</a></li>
<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>
<li><a href="#trunksrcwpincludesloadphp">trunk/src/wp-includes/load.php</a></li>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunksrcwpincludesmetaphp">trunk/src/wp-includes/meta.php</a></li>
<li><a href="#trunksrcwpincludesmsblogsphp">trunk/src/wp-includes/ms-blogs.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunksrcwpincludesnavmenutemplatephp">trunk/src/wp-includes/nav-menu-template.php</a></li>
<li><a href="#trunksrcwpincludesnavmenuphp">trunk/src/wp-includes/nav-menu.php</a></li>
<li><a href="#trunksrcwpincludesoptionphp">trunk/src/wp-includes/option.php</a></li>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunksrcwpincludespomomophp">trunk/src/wp-includes/pomo/mo.php</a></li>
<li><a href="#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="#trunksrcwpincludesrestapiclasswprestserverphp">trunk/src/wp-includes/rest-api/class-wp-rest-server.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="#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="#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="#trunksrcwpincludesrevisionphp">trunk/src/wp-includes/revision.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunksrcwpincludesthemecompatcommentsphp">trunk/src/wp-includes/theme-compat/comments.php</a></li>
<li><a href="#trunksrcwpincludesthemecompatembedcontentphp">trunk/src/wp-includes/theme-compat/embed-content.php</a></li>
<li><a href="#trunksrcwpincludesthemecompatheaderphp">trunk/src/wp-includes/theme-compat/header.php</a></li>
<li><a href="#trunksrcwpincludesthemecompatsidebarphp">trunk/src/wp-includes/theme-compat/sidebar.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="#trunksrcwpincludeswidgetsclasswpwidgetarchivesphp">trunk/src/wp-includes/widgets/class-wp-widget-archives.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="#trunksrcwpincludeswidgetsclasswpwidgetmediaaudiophp">trunk/src/wp-includes/widgets/class-wp-widget-media-audio.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetmediagalleryphp">trunk/src/wp-includes/widgets/class-wp-widget-media-gallery.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetmediaimagephp">trunk/src/wp-includes/widgets/class-wp-widget-media-image.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetmediavideophp">trunk/src/wp-includes/widgets/class-wp-widget-media-video.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetmediaphp">trunk/src/wp-includes/widgets/class-wp-widget-media.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetmetaphp">trunk/src/wp-includes/widgets/class-wp-widget-meta.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="#trunksrcwpincludeswidgetsclasswpwidgetrecentpostsphp">trunk/src/wp-includes/widgets/class-wp-widget-recent-posts.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="#trunksrcwplinksopmlphp">trunk/src/wp-links-opml.php</a></li>
<li><a href="#trunksrcwploginphp">trunk/src/wp-login.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="#trunktestsphpunitincludesfactoryclasswpunittestfactoryforattachmentphp">trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-attachment.php</a></li>
<li><a href="#trunktestsphpunitincludestestcaserestposttypecontrollerphp">trunk/tests/phpunit/includes/testcase-rest-post-type-controller.php</a></li>
<li><a href="#trunktestsphpunitincludesutilsphp">trunk/tests/phpunit/includes/utils.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesFilephp">trunk/tests/phpunit/tests/admin/includesFile.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesListTablephp">trunk/tests/phpunit/tests/admin/includesListTable.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="#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="#trunktestsphpunittestsajaxCustomizeMenusphp">trunk/tests/phpunit/tests/ajax/CustomizeMenus.php</a></li>
<li><a href="#trunktestsphpunittestsajaxQuickEditphp">trunk/tests/phpunit/tests/ajax/QuickEdit.php</a></li>
<li><a href="#trunktestsphpunittestsauthphp">trunk/tests/phpunit/tests/auth.php</a></li>
<li><a href="#trunktestsphpunittestscanonicalpageOnFrontphp">trunk/tests/phpunit/tests/canonical/pageOnFront.php</a></li>
<li><a href="#trunktestsphpunittestscategorycategoryDescriptionphp">trunk/tests/phpunit/tests/category/categoryDescription.php</a></li>
<li><a href="#trunktestsphpunittestscategorygetCategoryLinkphp">trunk/tests/phpunit/tests/category/getCategoryLink.php</a></li>
<li><a href="#trunktestsphpunittestscategorygetTheCategoryByIdphp">trunk/tests/phpunit/tests/category/getTheCategoryById.php</a></li>
<li><a href="#trunktestsphpunittestscategorywpListCategoriesphp">trunk/tests/phpunit/tests/category/wpListCategories.php</a></li>
<li><a href="#trunktestsphpunittestscommentcommentsTemplatephp">trunk/tests/phpunit/tests/comment/commentsTemplate.php</a></li>
<li><a href="#trunktestsphpunittestscommentdateQueryphp">trunk/tests/phpunit/tests/comment/dateQuery.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="#trunktestsphpunittestscommentwalkerphp">trunk/tests/phpunit/tests/comment/walker.php</a></li>
<li><a href="#trunktestsphpunittestscommentwpCommentphp">trunk/tests/phpunit/tests/comment/wpComment.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="#trunktestsphpunittestscompatphp">trunk/tests/phpunit/tests/compat.php</a></li>
<li><a href="#trunktestsphpunittestscronphp">trunk/tests/phpunit/tests/cron.php</a></li>
<li><a href="#trunktestsphpunittestscustomizecontrolphp">trunk/tests/phpunit/tests/customize/control.php</a></li>
<li><a href="#trunktestsphpunittestscustomizecustomcsssettingphp">trunk/tests/phpunit/tests/customize/custom-css-setting.php</a></li>
<li><a href="#trunktestsphpunittestscustomizemanagerphp">trunk/tests/phpunit/tests/customize/manager.php</a></li>
<li><a href="#trunktestsphpunittestscustomizenavmenuitemsettingphp">trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php</a></li>
<li><a href="#trunktestsphpunittestscustomizenavmenusettingphp">trunk/tests/phpunit/tests/customize/nav-menu-setting.php</a></li>
<li><a href="#trunktestsphpunittestscustomizenavmenusphp">trunk/tests/phpunit/tests/customize/nav-menus.php</a></li>
<li><a href="#trunktestsphpunittestscustomizepanelphp">trunk/tests/phpunit/tests/customize/panel.php</a></li>
<li><a href="#trunktestsphpunittestscustomizepartialphp">trunk/tests/phpunit/tests/customize/partial.php</a></li>
<li><a href="#trunktestsphpunittestscustomizesectionphp">trunk/tests/phpunit/tests/customize/section.php</a></li>
<li><a href="#trunktestsphpunittestscustomizeselectiverefreshajaxphp">trunk/tests/phpunit/tests/customize/selective-refresh-ajax.php</a></li>
<li><a href="#trunktestsphpunittestscustomizeselectiverefreshphp">trunk/tests/phpunit/tests/customize/selective-refresh.php</a></li>
<li><a href="#trunktestsphpunittestscustomizesettingphp">trunk/tests/phpunit/tests/customize/setting.php</a></li>
<li><a href="#trunktestsphpunittestsdatequeryphp">trunk/tests/phpunit/tests/date/query.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="#trunktestsphpunittestseditorwpEditorsphp">trunk/tests/phpunit/tests/editor/wpEditors.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="#trunktestsphpunittestsformattingEscUrlphp">trunk/tests/phpunit/tests/formatting/EscUrl.php</a></li>
<li><a href="#trunktestsphpunittestsformattingMapDeepphp">trunk/tests/phpunit/tests/formatting/MapDeep.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsanonymizationphp">trunk/tests/phpunit/tests/functions/anonymization.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsgetArchivesphp">trunk/tests/phpunit/tests/functions/getArchives.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionslistFilterphp">trunk/tests/phpunit/tests/functions/listFilter.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsphp">trunk/tests/phpunit/tests/functions.php</a></li>
<li><a href="#trunktestsphpunittestsgeneraldocumenttitlephp">trunk/tests/phpunit/tests/general/document-title.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="#trunktestsphpunittestshttpcurlphp">trunk/tests/phpunit/tests/http/curl.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="#trunktestsphpunittestsimageeditorphp">trunk/tests/phpunit/tests/image/editor.php</a></li>
<li><a href="#trunktestsphpunittestsimagefunctionsphp">trunk/tests/phpunit/tests/image/functions.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="#trunktestsphpunittestslinkgetAdjacentPostphp">trunk/tests/phpunit/tests/link/getAdjacentPost.php</a></li>
<li><a href="#trunktestsphpunittestslinkgetPostCommentsFeedLinkphp">trunk/tests/phpunit/tests/link/getPostCommentsFeedLink.php</a></li>
<li><a href="#trunktestsphpunittestslinkgetPreviewPostLinkphp">trunk/tests/phpunit/tests/link/getPreviewPostLink.php</a></li>
<li><a href="#trunktestsphpunittestslinkwpGetCanonicalURLphp">trunk/tests/phpunit/tests/link/wpGetCanonicalURL.php</a></li>
<li><a href="#trunktestsphpunittestslinkphp">trunk/tests/phpunit/tests/link.php</a></li>
<li><a href="#trunktestsphpunittestsmediagetAttachmentTaxonomiesphp">trunk/tests/phpunit/tests/media/getAttachmentTaxonomies.php</a></li>
<li><a href="#trunktestsphpunittestsmediaphp">trunk/tests/phpunit/tests/media.php</a></li>
<li><a href="#trunktestsphpunittestsmenuwpAjaxMenuQuickSearchphp">trunk/tests/phpunit/tests/menu/wpAjaxMenuQuickSearch.php</a></li>
<li><a href="#trunktestsphpunittestsmetaregisterMetaphp">trunk/tests/phpunit/tests/meta/registerMeta.php</a></li>
<li><a href="#trunktestsphpunittestsmetaphp">trunk/tests/phpunit/tests/meta.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitegetBlogDetailsphp">trunk/tests/phpunit/tests/multisite/getBlogDetails.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitesitephp">trunk/tests/phpunit/tests/multisite/site.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitesiteMetaphp">trunk/tests/phpunit/tests/multisite/siteMeta.php</a></li>
<li><a href="#trunktestsphpunittestsmultisiteupdateBlogDetailsphp">trunk/tests/phpunit/tests/multisite/updateBlogDetails.php</a></li>
<li><a href="#trunktestsphpunittestsoembedWpEmbedphp">trunk/tests/phpunit/tests/oembed/WpEmbed.php</a></li>
<li><a href="#trunktestsphpunittestsoembeddiscoveryphp">trunk/tests/phpunit/tests/oembed/discovery.php</a></li>
<li><a href="#trunktestsphpunittestsoembedgetResponseDataphp">trunk/tests/phpunit/tests/oembed/getResponseData.php</a></li>
<li><a href="#trunktestsphpunittestsoembedtemplatephp">trunk/tests/phpunit/tests/oembed/template.php</a></li>
<li><a href="#trunktestsphpunittestsoptionregistrationphp">trunk/tests/phpunit/tests/option/registration.php</a></li>
<li><a href="#trunktestsphpunittestspluggablephp">trunk/tests/phpunit/tests/pluggable.php</a></li>
<li><a href="#trunktestsphpunittestspomomophp">trunk/tests/phpunit/tests/pomo/mo.php</a></li>
<li><a href="#trunktestsphpunittestspomopophp">trunk/tests/phpunit/tests/pomo/po.php</a></li>
<li><a href="#trunktestsphpunittestspomotranslationsphp">trunk/tests/phpunit/tests/pomo/translations.php</a></li>
<li><a href="#trunktestsphpunittestspostgetBodyClassphp">trunk/tests/phpunit/tests/post/getBodyClass.php</a></li>
<li><a href="#trunktestsphpunittestspostgetPagesphp">trunk/tests/phpunit/tests/post/getPages.php</a></li>
<li><a href="#trunktestsphpunittestspostgetPostTypeLabelsphp">trunk/tests/phpunit/tests/post/getPostTypeLabels.php</a></li>
<li><a href="#trunktestsphpunittestspostisPostTypeViewablephp">trunk/tests/phpunit/tests/post/isPostTypeViewable.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="#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="#trunktestsphpunittestspostthumbnailsphp">trunk/tests/phpunit/tests/post/thumbnails.php</a></li>
<li><a href="#trunktestsphpunittestsposttypesphp">trunk/tests/phpunit/tests/post/types.php</a></li>
<li><a href="#trunktestsphpunittestspostwpInsertPostphp">trunk/tests/phpunit/tests/post/wpInsertPost.php</a></li>
<li><a href="#trunktestsphpunittestspostwpPostphp">trunk/tests/phpunit/tests/post/wpPost.php</a></li>
<li><a href="#trunktestsphpunittestspostwpPostTypephp">trunk/tests/phpunit/tests/post/wpPostType.php</a></li>
<li><a href="#trunktestsphpunittestspostphp">trunk/tests/phpunit/tests/post.php</a></li>
<li><a href="#trunktestsphpunittestsprivacywpPrivacySendRequestConfirmationNotificationphp">trunk/tests/phpunit/tests/privacy/wpPrivacySendRequestConfirmationNotification.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="#trunktestsphpunittestsquerypostStatusphp">trunk/tests/phpunit/tests/query/postStatus.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="#trunktestsphpunittestsqueryvarsphp">trunk/tests/phpunit/tests/query/vars.php</a></li>
<li><a href="#trunktestsphpunittestsqueryphp">trunk/tests/phpunit/tests/query.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="#trunktestsphpunittestsrestapirestcontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-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="#trunktestsphpunittestsrestapirestrequestvalidationphp">trunk/tests/phpunit/tests/rest-api/rest-request-validation.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestrequestphp">trunk/tests/phpunit/tests/rest-api/rest-request.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestrevisionscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-revisions-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestschemasanitizationphp">trunk/tests/phpunit/tests/rest-api/rest-schema-sanitization.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestschemasetupphp">trunk/tests/phpunit/tests/rest-api/rest-schema-setup.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestschemavalidationphp">trunk/tests/phpunit/tests/rest-api/rest-schema-validation.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="#trunktestsphpunittestsrestapiresttermmetafieldsphp">trunk/tests/phpunit/tests/rest-api/rest-term-meta-fields.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="#trunktestsphpunittestsrewriteaddRewriteRulephp">trunk/tests/phpunit/tests/rewrite/addRewriteRule.php</a></li>
<li><a href="#trunktestsphpunittestsrewriteoldDateRedirectphp">trunk/tests/phpunit/tests/rewrite/oldDateRedirect.php</a></li>
<li><a href="#trunktestsphpunittestsrewriteoldSlugRedirectphp">trunk/tests/phpunit/tests/rewrite/oldSlugRedirect.php</a></li>
<li><a href="#trunktestsphpunittestsrewritepermastructsphp">trunk/tests/phpunit/tests/rewrite/permastructs.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="#trunktestsphpunitteststaxonomygetObjectTaxonomiesphp">trunk/tests/phpunit/tests/taxonomy/getObjectTaxonomies.php</a></li>
<li><a href="#trunktestsphpunitteststaxonomyphp">trunk/tests/phpunit/tests/taxonomy.php</a></li>
<li><a href="#trunktestsphpunitteststemplatephp">trunk/tests/phpunit/tests/template.php</a></li>
<li><a href="#trunktestsphpunitteststermcachephp">trunk/tests/phpunit/tests/term/cache.php</a></li>
<li><a href="#trunktestsphpunitteststermgetEditTermLinkphp">trunk/tests/phpunit/tests/term/getEditTermLink.php</a></li>
<li><a href="#trunktestsphpunitteststermgetTagLinkphp">trunk/tests/phpunit/tests/term/getTagLink.php</a></li>
<li><a href="#trunktestsphpunitteststermgetTermLinkphp">trunk/tests/phpunit/tests/term/getTermLink.php</a></li>
<li><a href="#trunktestsphpunitteststermgetTermsphp">trunk/tests/phpunit/tests/term/getTerms.php</a></li>
<li><a href="#trunktestsphpunitteststermgetTheTermsphp">trunk/tests/phpunit/tests/term/getTheTerms.php</a></li>
<li><a href="#trunktestsphpunitteststermmetaphp">trunk/tests/phpunit/tests/term/meta.php</a></li>
<li><a href="#trunktestsphpunitteststermqueryphp">trunk/tests/phpunit/tests/term/query.php</a></li>
<li><a href="#trunktestsphpunitteststermsplitSharedTermphp">trunk/tests/phpunit/tests/term/splitSharedTerm.php</a></li>
<li><a href="#trunktestsphpunitteststermtermExistsphp">trunk/tests/phpunit/tests/term/termExists.php</a></li>
<li><a href="#trunktestsphpunitteststermwpDeleteTermphp">trunk/tests/phpunit/tests/term/wpDeleteTerm.php</a></li>
<li><a href="#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="#trunktestsphpunitteststermwpTaxonomyphp">trunk/tests/phpunit/tests/term/wpTaxonomy.php</a></li>
<li><a href="#trunktestsphpunitteststermwpTermphp">trunk/tests/phpunit/tests/term/wpTerm.php</a></li>
<li><a href="#trunktestsphpunitteststermwpUpdateTermphp">trunk/tests/phpunit/tests/term/wpUpdateTerm.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="#trunktestsphpunitteststhemecustomHeaderphp">trunk/tests/phpunit/tests/theme/customHeader.php</a></li>
<li><a href="#trunktestsphpunitteststhemephp">trunk/tests/phpunit/tests/theme.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="#trunktestsphpunittestsusercountUserPostsphp">trunk/tests/phpunit/tests/user/countUserPosts.php</a></li>
<li><a href="#trunktestsphpunittestsusercountUsersphp">trunk/tests/phpunit/tests/user/countUsers.php</a></li>
<li><a href="#trunktestsphpunittestsuserlistAuthorsphp">trunk/tests/phpunit/tests/user/listAuthors.php</a></li>
<li><a href="#trunktestsphpunittestsusermapMetaCapphp">trunk/tests/phpunit/tests/user/mapMetaCap.php</a></li>
<li><a href="#trunktestsphpunittestsuserqueryphp">trunk/tests/phpunit/tests/user/query.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="#trunktestsphpunittestswidgetscustomhtmlwidgetphp">trunk/tests/phpunit/tests/widgets/custom-html-widget.php</a></li>
<li><a href="#trunktestsphpunittestswidgetsmediaaudiowidgetphp">trunk/tests/phpunit/tests/widgets/media-audio-widget.php</a></li>
<li><a href="#trunktestsphpunittestswidgetsmediaimagewidgetphp">trunk/tests/phpunit/tests/widgets/media-image-widget.php</a></li>
<li><a href="#trunktestsphpunittestswidgetsmediavideowidgetphp">trunk/tests/phpunit/tests/widgets/media-video-widget.php</a></li>
<li><a href="#trunktestsphpunittestswidgetsmediawidgetphp">trunk/tests/phpunit/tests/widgets/media-widget.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="#trunktestsphpunittestsxmlrpcwpgetPostsphp">trunk/tests/phpunit/tests/xmlrpc/wp/getPosts.php</a></li>
<li><a href="#trunktestsqunitfixtureswpapigeneratedjs">trunk/tests/qunit/fixtures/wp-api-generated.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktravisyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.travis.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.travis.yml 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/.travis.yml 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,6 +12,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - WP_TRAVISCI=travis:phpunit
</span><span class="cx" style="display: block; padding: 0 10px"> matrix:
</span><span class="cx" style="display: block; padding: 0 10px"> include:
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - php: 7.2
+ env: WP_TRAVISCI=travis:format
</ins><span class="cx" style="display: block; padding: 0 10px"> - php: 7.1
</span><span class="cx" style="display: block; padding: 0 10px"> env: WP_TRAVISCI=travis:js
</span><span class="cx" style="display: block; padding: 0 10px"> - php: 7.2
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,6 +84,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ;;
</span><span class="cx" style="display: block; padding: 0 10px"> esac
</span><span class="cx" style="display: block; padding: 0 10px"> fi
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+- |
+ # We only need to run composer install on the code formatting job.
+ if [[ "$WP_TRAVISCI" == "travis:format" ]]; then
+ composer --version
+ composer install
+ fi
</ins><span class="cx" style="display: block; padding: 0 10px"> - npm --version
</span><span class="cx" style="display: block; padding: 0 10px"> - node --version
</span><span class="cx" style="display: block; padding: 0 10px"> - nvm install 8.9.3
</span></span></pre></div>
<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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/Gruntfile.js 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-content/plugins/hello.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-content/plugins/akismet/**'
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- cleanFiles = [];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ cleanFiles = [],
+ changedFiles = {
+ php: []
+ };
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> buildFiles.forEach( function( buildFile ) {
</span><span class="cx" style="display: block; padding: 0 10px"> cleanFiles.push( BUILD_DIR + buildFile );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1218,6 +1221,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.log.writeln( 'Cannot determine which files are modified as SVN and GIT are not available.' );
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.log.writeln( 'Running all tasks and all tests.' );
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.task.run([
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'format:php',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'precommit:js',
</span><span class="cx" style="display: block; padding: 0 10px"> 'precommit:css',
</span><span class="cx" style="display: block; padding: 0 10px"> 'precommit:image',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1250,7 +1254,7 @@
</span><span class="cx" style="display: 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 ( code === 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( [ 'package.json', 'Gruntfile.js' ].some( testPath ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( [ 'package.json', 'Gruntfile.js', 'composer.json' ].some( testPath ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> grunt.log.writeln( 'Configuration files modified. Running `prerelease`.' );
</span><span class="cx" style="display: block; padding: 0 10px"> taskList.push( 'prerelease' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1270,6 +1274,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.log.writeln( 'twemoji.js has updated. Running `precommit:emoji.' );
</span><span class="cx" style="display: block; padding: 0 10px"> taskList.push( 'precommit:emoji' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( testExtension( 'php' ) ) {
+ grunt.log.writeln( 'PHP files modified. Code formatting will be run.' );
+ var PHPfiles = result.stdout.split( '\n' );
+
+ // Find .php files that have been modified or added.
+ PHPfiles = PHPfiles.filter( function( file ) {
+ return /^\s*[MA]\s*.*\.php$/.test( file );
+ } );
+
+ PHPfiles = PHPfiles.map( function( file ) {
+ return file.replace( /^\s*[MA]\s*/, '' );
+ } );
+
+ changedFiles = {
+ php: PHPfiles
+ };
+
+ taskList.push( 'format:php' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.task.run( taskList );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1340,6 +1364,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.registerTask( 'prerelease', [
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'format:php:error',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'precommit:php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'precommit:js',
</span><span class="cx" style="display: block; padding: 0 10px"> 'precommit:css',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1360,9 +1385,28 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.registerTask('test', 'Runs all QUnit and PHPUnit tasks.', ['qunit:compiled', 'phpunit']);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ grunt.registerTask( 'format:php', 'Runs the code formatter on changed files.', function() {
+ var done = this.async();
+ var flags = this.flags;
+ var args = changedFiles.php;
+ args.unshift( 'format' );
+ grunt.util.spawn( {
+ cmd: 'composer',
+ args: args,
+ opts: { stdio: 'inherit' }
+ }, function( error ) {
+ if ( flags.error && error ) {
+ done( false );
+ } else {
+ done( true );
+ }
+ } );
+ } );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Travis CI tasks.
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.registerTask('travis:js', 'Runs Javascript Travis CI tasks.', [ 'jshint:corejs', 'qunit:compiled' ]);
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.registerTask('travis:phpunit', 'Runs PHPUnit Travis CI tasks.', [ 'build', 'phpunit' ]);
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ grunt.registerTask('travis:format', 'Runs Code formatting Travis CI tasks.', [ 'format:php:error' ]);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Patch task.
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.renameTask('patch_wordpress', 'patch');
</span></span></pre></div>
<a id="trunkcomposerjson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/composer.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/composer.json 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/composer.json 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,8 +10,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "issues": "https://core.trac.wordpress.org/"
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "require-dev": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
- "wp-coding-standards/wpcs": "dev-master"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "dealerdirect/phpcodesniffer-composer-installer": "~0.4.4",
+ "wp-coding-standards/wpcs": "~1.0.0"
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "scripts": {
</span><span class="cx" style="display: block; padding: 0 10px"> "format": "phpcbf --standard=phpcs.xml.dist --report-summary --report-source",
</span></span></pre></div>
<a id="trunkcomposerlock"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/composer.lock</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/composer.lock 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/composer.lock 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,10 +1,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> "_readme": [
</span><span class="cx" style="display: block; padding: 0 10px"> "This file locks the dependencies of your project to a known state",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
</ins><span class="cx" style="display: block; padding: 0 10px"> "This file is @generated automatically"
</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-hash": "9c2c871b813e89682ef445611d2f5363",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "content-hash": "525cadb533bc92cc922d79144b33b14a",
</ins><span class="cx" style="display: block; padding: 0 10px"> "packages": [],
</span><span class="cx" style="display: block; padding: 0 10px"> "packages-dev": [
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,16 +77,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"> "name": "squizlabs/php_codesniffer",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "version": "3.3.0",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "version": "3.3.1",
</ins><span class="cx" style="display: block; padding: 0 10px"> "source": {
</span><span class="cx" style="display: block; padding: 0 10px"> "type": "git",
</span><span class="cx" style="display: block; padding: 0 10px"> "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "reference": "d86873af43b4aa9d1f39a3601cc0cfcf02b25266"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "reference": "628a481780561150481a9ec74709092b9759b3ec"
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "dist": {
</span><span class="cx" style="display: block; padding: 0 10px"> "type": "zip",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d86873af43b4aa9d1f39a3601cc0cfcf02b25266",
- "reference": "d86873af43b4aa9d1f39a3601cc0cfcf02b25266",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/628a481780561150481a9ec74709092b9759b3ec",
+ "reference": "628a481780561150481a9ec74709092b9759b3ec",
</ins><span class="cx" style="display: block; padding: 0 10px"> "shasum": ""
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "require": {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,20 +124,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "phpcs",
</span><span class="cx" style="display: block; padding: 0 10px"> "standards"
</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": "2018-06-06T23:58:19+00:00"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "time": "2018-07-26T23:47:18+00:00"
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> "name": "wp-coding-standards/wpcs",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "version": "dev-master",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "version": "1.0.0",
</ins><span class="cx" style="display: block; padding: 0 10px"> "source": {
</span><span class="cx" style="display: block; padding: 0 10px"> "type": "git",
</span><span class="cx" style="display: block; padding: 0 10px"> "url": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "reference": "cf6b310caad735816caef7573295f8a534374706"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "reference": "539c6d74e6207daa22b7ea754d6f103e9abb2755"
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "dist": {
</span><span class="cx" style="display: block; padding: 0 10px"> "type": "zip",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "url": "https://api.github.com/repos/WordPress-Coding-Standards/WordPress-Coding-Standards/zipball/cf6b310caad735816caef7573295f8a534374706",
- "reference": "cf6b310caad735816caef7573295f8a534374706",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "url": "https://api.github.com/repos/WordPress-Coding-Standards/WordPress-Coding-Standards/zipball/539c6d74e6207daa22b7ea754d6f103e9abb2755",
+ "reference": "539c6d74e6207daa22b7ea754d6f103e9abb2755",
</ins><span class="cx" style="display: block; padding: 0 10px"> "shasum": ""
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "require": {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,8 +144,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "php": ">=5.3",
</span><span class="cx" style="display: block; padding: 0 10px"> "squizlabs/php_codesniffer": "^2.9.0 || ^3.0.2"
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "require-dev": {
+ "phpcompatibility/php-compatibility": "*"
+ },
</ins><span class="cx" style="display: block; padding: 0 10px"> "suggest": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically."
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "type": "phpcodesniffer-standard",
</span><span class="cx" style="display: block; padding: 0 10px"> "notification-url": "https://packagist.org/downloads/",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,14 +167,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "standards",
</span><span class="cx" style="display: block; padding: 0 10px"> "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">- "time": "2018-02-16T01:57:48+00:00"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "time": "2018-07-25T18:10:35+00:00"
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><span class="cx" style="display: block; padding: 0 10px"> "aliases": [],
</span><span class="cx" style="display: block; padding: 0 10px"> "minimum-stability": "stable",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "stability-flags": {
- "wp-coding-standards/wpcs": 20
- },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "stability-flags": [],
</ins><span class="cx" style="display: block; padding: 0 10px"> "prefer-stable": false,
</span><span class="cx" style="display: block; padding: 0 10px"> "prefer-lowest": false,
</span><span class="cx" style="display: block; padding: 0 10px"> "platform": [],
</span></span></pre></div>
<a id="trunkpackagelockjson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/package-lock.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/package-lock.json 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/package-lock.json 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8151,7 +8151,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "onetime": {
</span><span class="cx" style="display: block; padding: 0 10px"> "version": "1.1.0",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
</ins><span class="cx" style="display: block; padding: 0 10px"> "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
</span><span class="cx" style="display: block; padding: 0 10px"> "dev": true
</span><span class="cx" style="display: block; padding: 0 10px"> },
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/phpcs.xml.dist 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,6 +5,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <rule ref="WordPress-Core"/>
</span><span class="cx" style="display: block; padding: 0 10px"> <rule ref="WordPress.CodeAnalysis.EmptyStatement"/>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <rule ref="PEAR.Functions.FunctionCallSignature">
+ <properties>
+ <property name="allowMultipleArguments" value="false"/>
+ </properties>
+ </rule>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <arg name="extensions" value="php"/>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Strip the filepaths down to the relevant bit. -->
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,8 +24,10 @@
</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="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <!-- Exclude the build folder in the current directory, as Travis puts the checkout in a build directory. -->
+ <exclude-pattern type="relative">^build/*</exclude-pattern>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <!-- Directories and third party library exclusions -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <exclude-pattern>/build/*</exclude-pattern>
</del><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">@@ -87,6 +95,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <exclude-pattern>/wp-tests-config-sample\.php</exclude-pattern>
</span><span class="cx" style="display: block; padding: 0 10px"> </rule>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <rule ref="Generic.Files.LineEndings">
+ <exclude-pattern>/wp-config\.php</exclude-pattern>
+ <exclude-pattern>/wp-config-sample\.php</exclude-pattern>
+ </rule>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <!-- Whitelist test classes for select sniffs. -->
</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></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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/index.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> wp_load_translations_early();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Die with an error message
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$die = sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$die = sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %1$s: WordPress, %2$s: src, %3$s: build */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'You seem to be running %1$s from the %2$s directory. %1$s needs to be built and run from the %3$s directory before we can get started.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'WordPress',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,4 +46,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://make.wordpress.org/core/handbook/tutorials/installing-wordpress-locally/' )
</span><span class="cx" style="display: block; padding: 0 10px"> ) . '</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">-wp_die( $die, __( 'WordPress › Error' ) );
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+wp_die( $die, __( 'WordPress › Error' ) );
</ins></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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/_index.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> if ( $hide ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $classes .= ' 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">- ?>
</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"> <div id="welcome-panel" class="<?php echo esc_attr( $classes ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nonce_field( 'welcome-panel-nonce', 'welcomepanelnonce', false ); ?>
</span></span></pre></div>
<a id="trunksrcwpadminaboutphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/about.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/about.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/about.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> __( 'Major Customizer Improvements, Code Error Checking, and More! %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '🎉'
</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"> </h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Welcome to an improved Customizer workflow with design drafts, locking, scheduling, and preview links. What’s more, code syntax highlighting and error checking will make for a clean and smooth site building experience. Finally, if all that wasn’t pretty great, we’ve got a great new Gallery widget and improvements to theme browsing and switching.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</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"> __( 'Lend a Hand with Gutenberg %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '🤝'
</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"> </h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,7 +190,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://wordpress.org/plugins/gutenberg/' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'https://github.com/WordPress/gutenberg'
</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"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</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"> __( 'Developer Happiness %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '😊'
</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"> </h2>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="under-the-hood two-col">
</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"> __( 'We’ve made numerous improvements to the Customizer JS API in WordPress 4.9, eliminating many pain points and making it just as easy to work with as the PHP API. There are also new base control templates, a date/time control, and section/panel/global notifications to name a few. <a href="%s">Check out the full list.</a>' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'https://make.wordpress.org/core/2017/11/01/improvements-to-the-customize-js-api-in-4-9/'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="col">
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/admin.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +74,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int) ( $c / 50 ) ) == 1 ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . WPINC . '/http.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_get(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- admin_url( 'upgrade.php?step=1' ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ admin_url( 'upgrade.php?step=1' ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'timeout' => 120,
</span><span class="cx" style="display: block; padding: 0 10px"> 'httpversion' => '1.1',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/async-upload.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,7 +63,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 2:
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> echo get_media_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'send' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'delete' => true,
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/comment.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,49 +110,49 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $nonce_action = 'approve' == $action ? 'approve-comment_' : 'delete-comment_';
</span><span class="cx" style="display: block; padding: 0 10px"> $nonce_action .= $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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap">
</span><span class="cx" style="display: block; padding: 0 10px">
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-switch ( $action ) {
- case 'spam':
- $caution_msg = __( 'You are about to mark the following comment as spam:' );
- $button = _x( 'Mark as Spam', 'comment' );
- break;
- case 'trash':
- $caution_msg = __( 'You are about to move the following comment to the Trash:' );
- $button = __( 'Move to Trash' );
- break;
- case 'delete':
- $caution_msg = __( 'You are about to delete the following comment:' );
- $button = __( 'Permanently Delete Comment' );
- break;
- default:
- $caution_msg = __( 'You are about to approve the following comment:' );
- $button = __( 'Approve Comment' );
- break;
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ switch ( $action ) {
+ case 'spam':
+ $caution_msg = __( 'You are about to mark the following comment as spam:' );
+ $button = _x( 'Mark as Spam', 'comment' );
+ break;
+ case 'trash':
+ $caution_msg = __( 'You are about to move the following comment to the Trash:' );
+ $button = __( 'Move to Trash' );
+ break;
+ case 'delete':
+ $caution_msg = __( 'You are about to delete the following comment:' );
+ $button = __( 'Permanently Delete Comment' );
+ break;
+ default:
+ $caution_msg = __( 'You are about to approve the following comment:' );
+ $button = __( 'Approve Comment' );
+ break;
+ }
</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 ( $comment->comment_approved != '0' ) { // if not unapproved
- $message = '';
- switch ( $comment->comment_approved ) {
- case '1':
- $message = __( 'This comment is currently approved.' );
- break;
- case 'spam':
- $message = __( 'This comment is currently marked as spam.' );
- break;
- case 'trash':
- $message = __( 'This comment is currently in the Trash.' );
- break;
- }
- if ( $message ) {
- echo '<div id="message" class="notice notice-info"><p>' . $message . '</p></div>';
- }
-}
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $comment->comment_approved != '0' ) { // if not unapproved
+ $message = '';
+ switch ( $comment->comment_approved ) {
+ case '1':
+ $message = __( 'This comment is currently approved.' );
+ break;
+ case 'spam':
+ $message = __( 'This comment is currently marked as spam.' );
+ break;
+ case 'trash':
+ $message = __( 'This comment is currently in the Trash.' );
+ break;
+ }
+ if ( $message ) {
+ echo '<div id="message" class="notice notice-info"><p>' . $message . '</p></div>';
+ }
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="message" class="notice notice-warning"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php echo $caution_msg; ?></p></div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table comment-ays">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,13 +160,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Author' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><?php comment_author( $comment ); ?></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 if ( get_comment_author_email( $comment ) ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( get_comment_author_email( $comment ) ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Email' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><?php comment_author_email( $comment ); ?></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">-<?php if ( get_comment_author_url( $comment ) ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( get_comment_author_url( $comment ) ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'URL' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><a href="<?php comment_author_url( $comment ); ?>"><?php comment_author_url( $comment ); ?></a></td>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,33 +175,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php /* translators: column name or table row header */ _e( 'In Response To' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = $comment->comment_post_ID;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( current_user_can( 'edit_post', $post_id ) ) {
- $post_link = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
- $post_link .= esc_html( get_the_title( $post_id ) ) . '</a>';
- } else {
- $post_link = esc_html( get_the_title( $post_id ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( current_user_can( 'edit_post', $post_id ) ) {
+ $post_link = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
+ $post_link .= esc_html( get_the_title( $post_id ) ) . '</a>';
+ } else {
+ $post_link = esc_html( get_the_title( $post_id ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> echo $post_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">- if ( $comment->comment_parent ) {
- $parent = get_comment( $comment->comment_parent );
- $parent_link = esc_url( get_comment_link( $parent ) );
- $name = get_comment_author( $parent );
- printf(
- /* translators: %s: comment link */
- ' | ' . __( 'In reply to %s.' ),
- '<a href="' . $parent_link . '">' . $name . '</a>'
- );
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $comment->comment_parent ) {
+ $parent = get_comment( $comment->comment_parent );
+ $parent_link = esc_url( get_comment_link( $parent ) );
+ $name = get_comment_author( $parent );
+ printf(
+ /* translators: %s: comment link */
+ ' | ' . __( 'In reply to %s.' ),
+ '<a href="' . $parent_link . '">' . $name . '</a>'
+ );
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Submitted on' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: comment date, 2: comment time */
</span><span class="cx" style="display: block; padding: 0 10px"> $submitted = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( '%1$s at %2$s' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,11 +209,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> get_comment_date( __( 'Y/m/d' ), $comment ),
</span><span class="cx" style="display: block; padding: 0 10px"> get_comment_date( __( 'g:i a' ), $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 ( 'approved' === wp_get_comment_status( $comment ) && ! empty( $comment->comment_post_ID ) ) {
- echo '<a href="' . esc_url( get_comment_link( $comment ) ) . '">' . $submitted . '</a>';
- } else {
- echo $submitted;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'approved' === wp_get_comment_status( $comment ) && ! empty( $comment->comment_post_ID ) ) {
+ echo '<a href="' . esc_url( get_comment_link( $comment ) ) . '">' . $submitted . '</a>';
+ } else {
+ echo $submitted;
+ }
</ins><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><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"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php /* translators: field name in comment form */ _ex( 'Comment', 'noun' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td class="comment-content">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php comment_text( $comment ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php comment_text( $comment ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="edit-comment"><a href="<?php echo admin_url( "comment.php?action=editcomment&c={$comment->comment_ID}" ); ?>"><?php esc_html_e( 'Edit' ); ?></a></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -229,11 +229,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <form action="comment.php" method="get" class="comment-ays-submit">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><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 submit_button( $button, 'primary', 'submit', false ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( $button, 'primary', 'submit', false ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo admin_url( 'edit-comments.php' ); ?>" class="button-cancel"><?php esc_html_e( 'Cancel' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> </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">- <?php wp_nonce_field( $nonce_action ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( $nonce_action ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="action" value="<?php echo esc_attr( $formaction ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="c" value="<?php echo esc_attr( $comment->comment_ID ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="noredir" value="1" />
</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"> </form>
</span><span class="cx" style="display: block; padding: 0 10px">
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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 'deletecomment':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -290,7 +290,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'trashed' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'ids' => $comment_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $redir
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $redir
</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 'untrashcomment':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -303,7 +304,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'spammed' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'ids' => $comment_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $redir
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $redir
</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 'unspamcomment':
</span></span></pre></div>
<a id="trunksrcwpadmincustombackgroundphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/custom-background.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/custom-background.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/custom-background.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,28 +221,28 @@
</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"> public function admin_page() {
</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"> <div class="wrap" id="custom-background">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1><?php _e( 'Custom Background' ); ?></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 ( current_user_can( 'customize' ) ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( current_user_can( 'customize' ) ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="notice notice-info hide-if-no-customize">
</span><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
- printf(
- __( 'You can now manage and live-preview Custom Backgrounds in the <a href="%1$s">Customizer</a>.' ),
- admin_url( 'customize.php?autofocus[control]=background_image' )
- );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ printf(
+ __( 'You can now manage and live-preview Custom Backgrounds in the <a href="%1$s">Customizer</a>.' ),
+ admin_url( 'customize.php?autofocus[control]=background_image' )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</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 } ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?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">-<?php if ( ! empty( $this->updated ) ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! empty( $this->updated ) ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="message" class="updated">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php printf( __( 'Background updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) ); ?></p>
</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 } ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php } ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php _e( 'Background Image' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,34 +251,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Preview' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- if ( $this->admin_image_div_callback ) {
- call_user_func( $this->admin_image_div_callback );
- } else {
- $background_styles = '';
- if ( $bgcolor = get_background_color() ) {
- $background_styles .= 'background-color: #' . $bgcolor . ';';
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( $this->admin_image_div_callback ) {
+ call_user_func( $this->admin_image_div_callback );
+ } else {
+ $background_styles = '';
+ if ( $bgcolor = get_background_color() ) {
+ $background_styles .= 'background-color: #' . $bgcolor . ';';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $background_image_thumb = get_background_image();
- if ( $background_image_thumb ) {
- $background_image_thumb = esc_url( set_url_scheme( get_theme_mod( 'background_image_thumb', str_replace( '%', '%%', $background_image_thumb ) ) ) );
- $background_position_x = get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) );
- $background_position_y = get_theme_mod( 'background_position_y', get_theme_support( 'custom-background', 'default-position-y' ) );
- $background_size = get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) );
- $background_repeat = get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) );
- $background_attachment = get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'default-attachment' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $background_image_thumb = get_background_image();
+ if ( $background_image_thumb ) {
+ $background_image_thumb = esc_url( set_url_scheme( get_theme_mod( 'background_image_thumb', str_replace( '%', '%%', $background_image_thumb ) ) ) );
+ $background_position_x = get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) );
+ $background_position_y = get_theme_mod( 'background_position_y', get_theme_support( 'custom-background', 'default-position-y' ) );
+ $background_size = get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) );
+ $background_repeat = get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) );
+ $background_attachment = get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'default-attachment' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Background-image URL must be single quote, see below.
- $background_styles .= " background-image: url('$background_image_thumb');"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Background-image URL must be single quote, see below.
+ $background_styles .= " background-image: url('$background_image_thumb');"
</ins><span class="cx" style="display: block; padding: 0 10px"> . " background-size: $background_size;"
</span><span class="cx" style="display: block; padding: 0 10px"> . " background-position: $background_position_x $background_position_y;"
</span><span class="cx" style="display: block; padding: 0 10px"> . " background-repeat: $background_repeat;"
</span><span class="cx" style="display: block; padding: 0 10px"> . " background-attachment: $background_attachment;";
</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"> <div id="custom-background-image" style="<?php echo $background_styles; ?>"><?php // must be double quote, see above ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $background_image_thumb ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $background_image_thumb ) { ?>
</ins><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="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,34 +287,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</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_background_image() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( get_background_image() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Remove Image' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <form method="post">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php wp_nonce_field( 'custom-background-remove', '_wpnonce-custom-background-remove' ); ?>
-<?php submit_button( __( 'Remove Background Image' ), '', 'remove-background', false ); ?><br/>
-<?php _e( 'This will remove the background image. You will not be able to restore any customizations.' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( 'custom-background-remove', '_wpnonce-custom-background-remove' ); ?>
+ <?php submit_button( __( 'Remove Background Image' ), '', 'remove-background', false ); ?><br/>
+ <?php _e( 'This will remove the background image. You will not be able to restore any customizations.' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </form>
</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; ?>
</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 $default_image = get_theme_support( 'custom-background', 'default-image' ); ?>
-<?php if ( $default_image && get_background_image() != $default_image ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $default_image = get_theme_support( 'custom-background', 'default-image' ); ?>
+ <?php if ( $default_image && get_background_image() != $default_image ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Restore Original Image' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <form method="post">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php wp_nonce_field( 'custom-background-reset', '_wpnonce-custom-background-reset' ); ?>
-<?php submit_button( __( 'Restore Original Image' ), '', 'reset-background', false ); ?><br/>
-<?php _e( 'This will restore the original background image. You will not be able to restore any customizations.' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( 'custom-background-reset', '_wpnonce-custom-background-reset' ); ?>
+ <?php submit_button( __( 'Restore Original Image' ), '', 'reset-background', false ); ?><br/>
+ <?php _e( 'This will restore the original background image. You will not be able to restore any customizations.' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </form>
</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; ?>
</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 ( current_user_can( 'upload_files' ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( current_user_can( 'upload_files' ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Select Image' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,8 +322,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label><br />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="file" id="upload" name="import" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="action" value="save" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php wp_nonce_field( 'custom-background-upload', '_wpnonce-custom-background-upload' ); ?>
- <?php submit_button( __( 'Upload' ), '', 'submit', false ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( 'custom-background-upload', '_wpnonce-custom-background-upload' ); ?>
+ <?php submit_button( __( 'Upload' ), '', 'submit', false ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="choose-from-library-link"><?php _e( 'Or choose an image from your media library:' ); ?></label><br />
</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"> </form>
</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; ?>
</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"> </tbody>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,68 +342,68 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <form method="post">
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</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">-<?php if ( get_background_image() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( get_background_image() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input name="background-preset" type="hidden" value="custom">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-$background_position = sprintf(
- '%s %s',
- get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) ),
- get_theme_mod( 'background_position_y', get_theme_support( 'custom-background', 'default-position-y' ) )
-);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $background_position = sprintf(
+ '%s %s',
+ get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) ),
+ get_theme_mod( 'background_position_y', get_theme_support( 'custom-background', 'default-position-y' ) )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$background_position_options = array(
- array(
- 'left top' => array(
- 'label' => __( 'Top Left' ),
- 'icon' => 'dashicons dashicons-arrow-left-alt',
- ),
- 'center top' => array(
- 'label' => __( 'Top' ),
- 'icon' => 'dashicons dashicons-arrow-up-alt',
- ),
- 'right top' => array(
- 'label' => __( 'Top Right' ),
- 'icon' => 'dashicons dashicons-arrow-right-alt',
- ),
- ),
- array(
- 'left center' => array(
- 'label' => __( 'Left' ),
- 'icon' => 'dashicons dashicons-arrow-left-alt',
- ),
- 'center center' => array(
- 'label' => __( 'Center' ),
- 'icon' => 'background-position-center-icon',
- ),
- 'right center' => array(
- 'label' => __( 'Right' ),
- 'icon' => 'dashicons dashicons-arrow-right-alt',
- ),
- ),
- array(
- 'left bottom' => array(
- 'label' => __( 'Bottom Left' ),
- 'icon' => 'dashicons dashicons-arrow-left-alt',
- ),
- 'center bottom' => array(
- 'label' => __( 'Bottom' ),
- 'icon' => 'dashicons dashicons-arrow-down-alt',
- ),
- 'right bottom' => array(
- 'label' => __( 'Bottom Right' ),
- 'icon' => 'dashicons dashicons-arrow-right-alt',
- ),
- ),
-);
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $background_position_options = array(
+ array(
+ 'left top' => array(
+ 'label' => __( 'Top Left' ),
+ 'icon' => 'dashicons dashicons-arrow-left-alt',
+ ),
+ 'center top' => array(
+ 'label' => __( 'Top' ),
+ 'icon' => 'dashicons dashicons-arrow-up-alt',
+ ),
+ 'right top' => array(
+ 'label' => __( 'Top Right' ),
+ 'icon' => 'dashicons dashicons-arrow-right-alt',
+ ),
+ ),
+ array(
+ 'left center' => array(
+ 'label' => __( 'Left' ),
+ 'icon' => 'dashicons dashicons-arrow-left-alt',
+ ),
+ 'center center' => array(
+ 'label' => __( 'Center' ),
+ 'icon' => 'background-position-center-icon',
+ ),
+ 'right center' => array(
+ 'label' => __( 'Right' ),
+ 'icon' => 'dashicons dashicons-arrow-right-alt',
+ ),
+ ),
+ array(
+ 'left bottom' => array(
+ 'label' => __( 'Bottom Left' ),
+ 'icon' => 'dashicons dashicons-arrow-left-alt',
+ ),
+ 'center bottom' => array(
+ 'label' => __( 'Bottom' ),
+ 'icon' => 'dashicons dashicons-arrow-down-alt',
+ ),
+ 'right bottom' => array(
+ 'label' => __( 'Bottom Right' ),
+ 'icon' => 'dashicons dashicons-arrow-right-alt',
+ ),
+ ),
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Image Position' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Image Position' ); ?></span></legend>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="background-position-control">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php foreach ( $background_position_options as $group ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php foreach ( $background_position_options as $group ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="button-group">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php foreach ( $group as $value => $input ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php foreach ( $group as $value => $input ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input class="screen-reader-text" name="background-position" type="radio" value="<?php echo esc_attr( $value ); ?>"<?php checked( $value, $background_position ); ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="button display-options position"><span class="<?php echo esc_attr( $input['icon'] ); ?>" aria-hidden="true"></span></span>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -446,12 +446,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Background Color' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Color' ); ?></span></legend>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-$default_color = '';
-if ( current_theme_supports( 'custom-background', 'default-color' ) ) {
- $default_color = ' data-default-color="#' . esc_attr( get_theme_support( 'custom-background', 'default-color' ) ) . '"';
-}
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $default_color = '';
+ if ( current_theme_supports( 'custom-background', 'default-color' ) ) {
+ $default_color = ' data-default-color="#' . esc_attr( get_theme_support( 'custom-background', 'default-color' ) ) . '"';
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="text" name="background-color" id="background-color" value="#<?php echo esc_attr( get_background_color() ); ?>"<?php echo $default_color; ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -458,12 +458,12 @@
</span><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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php wp_nonce_field( 'custom-background' ); ?>
-<?php submit_button( null, 'primary', 'save-background-options' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( 'custom-background' ); ?>
+ <?php submit_button( null, 'primary', 'save-background-options' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px">
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -581,7 +581,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/media.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $sizes = array_keys(
</span><span class="cx" style="display: block; padding: 0 10px"> apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image_size_names_choose', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image_size_names_choose',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail' => __( 'Thumbnail' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'medium' => __( 'Medium' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'large' => __( 'Large' ),
</span></span></pre></div>
<a id="trunksrcwpadmincustomheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/custom-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/custom-header.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/custom-header.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -380,7 +380,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"> </script>
</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
</ins><span class="cx" style="display: block; 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">@@ -390,7 +390,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function js_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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> function onEndCrop( coords ) {
</span><span class="cx" style="display: block; padding: 0 10px"> jQuery( '#x1' ).val(coords.x);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -426,19 +426,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> y2: yinit,
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><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><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"> aspectRatio: xinit + ':' + yinit,
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_theme_supports( 'custom-header', 'flex-height' ) ) {
</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"> maxHeight: <?php echo get_theme_support( 'custom-header', 'height' ); ?>,
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
</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"> maxWidth: <?php echo get_theme_support( 'custom-header', 'width' ); ?>,
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> onInit: function () {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -454,7 +454,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</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
</ins><span class="cx" style="display: block; 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">@@ -464,29 +464,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function step_1() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->process_default_headers();
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1><?php _e( 'Custom Header' ); ?></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 ( current_user_can( 'customize' ) ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( current_user_can( 'customize' ) ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="notice notice-info hide-if-no-customize">
</span><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
- printf(
- __( 'You can now manage and live-preview Custom Header in the <a href="%1$s">Customizer</a>.' ),
- admin_url( 'customize.php?autofocus[control]=header_image' )
- );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ printf(
+ __( 'You can now manage and live-preview Custom Header in the <a href="%1$s">Customizer</a>.' ),
+ admin_url( 'customize.php?autofocus[control]=header_image' )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</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 } ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?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">-<?php if ( ! empty( $this->updated ) ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! empty( $this->updated ) ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="message" class="updated">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php printf( __( 'Header updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) ); ?></p>
</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 } ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php } ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php _e( 'Header Image' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -493,104 +493,104 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <tbody>
</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_custom_header() || display_header_text() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( get_custom_header() || display_header_text() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Preview' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- if ( $this->admin_image_div_callback ) {
- call_user_func( $this->admin_image_div_callback );
- } else {
- $custom_header = get_custom_header();
- $header_image = get_header_image();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( $this->admin_image_div_callback ) {
+ call_user_func( $this->admin_image_div_callback );
+ } else {
+ $custom_header = get_custom_header();
+ $header_image = get_header_image();
</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 ( $header_image ) {
- $header_image_style = 'background-image:url(' . esc_url( $header_image ) . ');';
- } else {
- $header_image_style = '';
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $header_image ) {
+ $header_image_style = 'background-image:url(' . esc_url( $header_image ) . ');';
+ } else {
+ $header_image_style = '';
+ }
</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 ( $custom_header->width ) {
- $header_image_style .= 'max-width:' . $custom_header->width . 'px;';
- }
- if ( $custom_header->height ) {
- $header_image_style .= 'height:' . $custom_header->height . 'px;';
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $custom_header->width ) {
+ $header_image_style .= 'max-width:' . $custom_header->width . 'px;';
+ }
+ if ( $custom_header->height ) {
+ $header_image_style .= 'height:' . $custom_header->height . 'px;';
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="headimg" style="<?php echo $header_image_style; ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- if ( display_header_text() ) {
- $style = ' style="color:#' . get_header_textcolor() . ';"';
- } else {
- $style = ' style="display:none;"';
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( display_header_text() ) {
+ $style = ' style="color:#' . get_header_textcolor() . ';"';
+ } else {
+ $style = ' style="display:none;"';
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <h1><a id="name" class="displaying-header-text" <?php echo $style; ?> onclick="return false;" href="<?php bloginfo( 'url' ); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="desc" class="displaying-header-text" <?php echo $style; ?>><?php bloginfo( 'description' ); ?></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 } ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php } ?>
</ins><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; ?>
</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 ( current_user_can( 'upload_files' ) && current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( current_user_can( 'upload_files' ) && current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Select Image' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'You can select an image to be shown at the top of your site by uploading from your computer or choosing from your media library. After selecting an image you will be able to crop it.' ); ?><br />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
- printf( __( 'Images of exactly <strong>%1$d × %2$d pixels</strong> will be used as-is.' ) . '<br />', get_theme_support( 'custom-header', 'width' ), get_theme_support( 'custom-header', 'height' ) );
- } elseif ( current_theme_supports( 'custom-header', 'flex-height' ) ) {
- if ( ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
- printf(
- /* translators: %s: size in pixels */
- __( 'Images should be at least %s wide.' ) . ' ',
- sprintf(
- /* translators: %d: custom header width */
- '<strong>' . __( '%d pixels' ) . '</strong>',
- get_theme_support( 'custom-header', 'width' )
- )
- );
- }
- } elseif ( current_theme_supports( 'custom-header', 'flex-width' ) ) {
- if ( ! current_theme_supports( 'custom-header', 'flex-height' ) ) {
- printf(
- /* translators: %s: size in pixels */
- __( 'Images should be at least %s tall.' ) . ' ',
- sprintf(
- /* translators: %d: custom header height */
- '<strong>' . __( '%d pixels' ) . '</strong>',
- get_theme_support( 'custom-header', 'height' )
- )
- );
- }
- }
- if ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) {
- if ( current_theme_supports( 'custom-header', 'width' ) ) {
- printf(
- /* translators: %s: size in pixels */
- __( 'Suggested width is %s.' ) . ' ',
- sprintf(
- /* translators: %d: custom header width */
- '<strong>' . __( '%d pixels' ) . '</strong>',
- get_theme_support( 'custom-header', 'width' )
- )
- );
- }
- if ( current_theme_supports( 'custom-header', 'height' ) ) {
- printf(
- /* translators: %s: size in pixels */
- __( 'Suggested height is %s.' ) . ' ',
- sprintf(
- /* translators: %d: custom header height */
- '<strong>' . __( '%d pixels' ) . '</strong>',
- get_theme_support( 'custom-header', 'height' )
- )
- );
- }
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
+ printf( __( 'Images of exactly <strong>%1$d × %2$d pixels</strong> will be used as-is.' ) . '<br />', get_theme_support( 'custom-header', 'width' ), get_theme_support( 'custom-header', 'height' ) );
+ } elseif ( current_theme_supports( 'custom-header', 'flex-height' ) ) {
+ if ( ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
+ printf(
+ /* translators: %s: size in pixels */
+ __( 'Images should be at least %s wide.' ) . ' ',
+ sprintf(
+ /* translators: %d: custom header width */
+ '<strong>' . __( '%d pixels' ) . '</strong>',
+ get_theme_support( 'custom-header', 'width' )
+ )
+ );
+ }
+ } elseif ( current_theme_supports( 'custom-header', 'flex-width' ) ) {
+ if ( ! current_theme_supports( 'custom-header', 'flex-height' ) ) {
+ printf(
+ /* translators: %s: size in pixels */
+ __( 'Images should be at least %s tall.' ) . ' ',
+ sprintf(
+ /* translators: %d: custom header height */
+ '<strong>' . __( '%d pixels' ) . '</strong>',
+ get_theme_support( 'custom-header', 'height' )
+ )
+ );
+ }
+ }
+ if ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) {
+ if ( current_theme_supports( 'custom-header', 'width' ) ) {
+ printf(
+ /* translators: %s: size in pixels */
+ __( 'Suggested width is %s.' ) . ' ',
+ sprintf(
+ /* translators: %d: custom header width */
+ '<strong>' . __( '%d pixels' ) . '</strong>',
+ get_theme_support( 'custom-header', 'width' )
+ )
+ );
+ }
+ if ( current_theme_supports( 'custom-header', 'height' ) ) {
+ printf(
+ /* translators: %s: size in pixels */
+ __( 'Suggested height is %s.' ) . ' ',
+ sprintf(
+ /* translators: %d: custom header height */
+ '<strong>' . __( '%d pixels' ) . '</strong>',
+ get_theme_support( 'custom-header', 'height' )
+ )
+ );
+ }
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post" action="<?php echo esc_url( add_query_arg( 'step', 2 ) ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -597,20 +597,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label><br />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="file" id="upload" name="import" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="action" value="save" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php wp_nonce_field( 'custom-header-upload', '_wpnonce-custom-header-upload' ); ?>
- <?php submit_button( __( 'Upload' ), '', 'submit', false ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( 'custom-header-upload', '_wpnonce-custom-header-upload' ); ?>
+ <?php submit_button( __( 'Upload' ), '', 'submit', false ); ?>
</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
- $modal_update_href = esc_url(
- add_query_arg(
- array(
- 'page' => 'custom-header',
- 'step' => 2,
- '_wpnonce-custom-header-upload' => wp_create_nonce( 'custom-header-upload' ),
- ), admin_url( 'themes.php' )
- )
- );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $modal_update_href = esc_url(
+ add_query_arg(
+ array(
+ 'page' => 'custom-header',
+ 'step' => 2,
+ '_wpnonce-custom-header-upload' => wp_create_nonce( 'custom-header-upload' ),
+ ),
+ admin_url( 'themes.php' )
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="choose-from-library-link"><?php _e( 'Or choose an image from your media library:' ); ?></label><br />
</span><span class="cx" style="display: block; padding: 0 10px"> <button id="choose-from-library-link" class="button"
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -621,25 +622,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</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; ?>
</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"> </tbody>
</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"> <form method="post" action="<?php echo esc_url( add_query_arg( 'step', 1 ) ); ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php submit_button( null, 'screen-reader-text', 'save-header-options', false ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( null, 'screen-reader-text', 'save-header-options', false ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</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">- <?php if ( get_uploaded_header_images() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( get_uploaded_header_images() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Uploaded Images' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'You can choose one of your previously uploaded headers, or show a random one.' ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- $this->show_header_selector( 'uploaded' );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $this->show_header_selector( 'uploaded' );
+ ?>
</ins><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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->default_headers ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -646,11 +647,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Default Images' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'If you don‘t want to upload your own image, you can use one of these cool headers, or show a random one.' ); ?></p>
</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"> <p><?php _e( 'You can use one of these cool headers or show a random one on each page.' ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endif; ?>
</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"> $this->show_header_selector( 'default' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -684,7 +685,7 @@
</span><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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( current_theme_supports( 'custom-header', 'header-text' ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( current_theme_supports( 'custom-header', 'header-text' ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php _e( 'Header Text' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -703,50 +704,50 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Text Color' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><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
- $default_color = '';
- if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) {
- $default_color = get_theme_support( 'custom-header', 'default-text-color' );
- if ( $default_color && false === strpos( $default_color, '#' ) ) {
- $default_color = '#' . $default_color;
- }
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $default_color = '';
+ if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) {
+ $default_color = get_theme_support( 'custom-header', 'default-text-color' );
+ if ( $default_color && false === strpos( $default_color, '#' ) ) {
+ $default_color = '#' . $default_color;
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $default_color_attr = $default_color ? ' data-default-color="' . esc_attr( $default_color ) . '"' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $default_color_attr = $default_color ? ' data-default-color="' . esc_attr( $default_color ) . '"' : '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $header_textcolor = display_header_text() ? get_header_textcolor() : get_theme_support( 'custom-header', 'default-text-color' );
- if ( $header_textcolor && false === strpos( $header_textcolor, '#' ) ) {
- $header_textcolor = '#' . $header_textcolor;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $header_textcolor = display_header_text() ? get_header_textcolor() : get_theme_support( 'custom-header', 'default-text-color' );
+ if ( $header_textcolor && false === strpos( $header_textcolor, '#' ) ) {
+ $header_textcolor = '#' . $header_textcolor;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<input type="text" name="text-color" id="text-color" value="' . esc_attr( $header_textcolor ) . '"' . $default_color_attr . ' />';
- if ( $default_color ) {
- echo ' <span class="description hide-if-js">' . sprintf( _x( 'Default: %s', 'color' ), esc_html( $default_color ) ) . '</span>';
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<input type="text" name="text-color" id="text-color" value="' . esc_attr( $header_textcolor ) . '"' . $default_color_attr . ' />';
+ if ( $default_color ) {
+ echo ' <span class="description hide-if-js">' . sprintf( _x( 'Default: %s', 'color' ), esc_html( $default_color ) ) . '</span>';
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> </tbody>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</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
</ins><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">-/**
- * Fires just before the submit button in the custom header options form.
- *
- * @since 3.1.0
- */
-do_action( 'custom_header_options' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Fires just before the submit button in the custom header options form.
+ *
+ * @since 3.1.0
+ */
+ do_action( 'custom_header_options' );
</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_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php submit_button( null, 'primary', 'save-header-options' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( null, 'primary', 'save-header-options' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -852,18 +853,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="height" id="height" value="<?php echo esc_attr( $height ); ?>"/>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr( $attachment_id ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr( $oitar ); ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( empty( $_POST ) && isset( $_GET['file'] ) ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( empty( $_POST ) && isset( $_GET['file'] ) ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="create-new-attachment" value="true" />
</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">- <?php wp_nonce_field( 'custom-header-crop-image' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( 'custom-header-crop-image' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="submit">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php submit_button( __( 'Crop and Publish' ), 'primary', 'submit', false ); ?>
- <?php
- if ( isset( $oitar ) && 1 == $oitar && ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) ) {
- submit_button( __( 'Skip Cropping, Publish Image as Is' ), '', 'skip-cropping', false );
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( __( 'Crop and Publish' ), 'primary', 'submit', false ); ?>
+ <?php
+ if ( isset( $oitar ) && 1 == $oitar && ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) ) {
+ submit_button( __( 'Skip Cropping, Publish Image as Is' ), '', 'skip-cropping', false );
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/edit-form-advanced.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> /* translators: Publish box date format, see https://secure.php.net/date */
</span><span class="cx" style="display: block; padding: 0 10px"> $scheduled_date = date_i18n( __( 'M j, Y @ H:i' ), strtotime( $post->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">-$messages['post'] = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$messages['post'] = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 0 => '', // Unused. Messages start at index 1.
</span><span class="cx" style="display: block; padding: 0 10px"> 1 => __( 'Post updated.' ) . $view_post_link_html,
</span><span class="cx" style="display: block; padding: 0 10px"> 2 => __( 'Custom field updated.' ),
</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"> 9 => sprintf( __( 'Post scheduled for: %s.' ), '<strong>' . $scheduled_date . '</strong>' ) . $scheduled_post_link_html,
</span><span class="cx" style="display: block; padding: 0 10px"> 10 => __( 'Post draft updated.' ) . $preview_post_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">-$messages['page'] = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$messages['page'] = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 0 => '', // Unused. Messages start at index 1.
</span><span class="cx" style="display: block; padding: 0 10px"> 1 => __( 'Page updated.' ) . $view_page_link_html,
</span><span class="cx" style="display: block; padding: 0 10px"> 2 => __( 'Custom field updated.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,7 +394,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'do_meta_boxes', $post_type, 'side', $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_screen_option(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'layout_columns', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'layout_columns',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'max' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -586,7 +587,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" id="referredby" name="referredby" value="<?php echo $referer ? esc_url( $referer ) : ''; ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! empty( $active_post_lock ) ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" id="active_post_lock" value="<?php echo esc_attr( implode( ':', $active_post_lock ) ); ?>" />
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'draft' != get_post_status( $post ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_original_referer_field( true, 'previous' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -632,50 +633,50 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="screen-reader-text" id="title-prompt-text" for="title"><?php echo $title_placeholder; ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" name="post_title" size="30" value="<?php echo esc_attr( $post->post_title ); ?>" id="title" spellcheck="true" autocomplete="off" />
</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
-/**
- * Fires before the permalink field in the edit form.
- *
- * @since 4.1.0
- *
- * @param WP_Post $post Post object.
- */
-do_action( 'edit_form_before_permalink', $post );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Fires before the permalink field in the edit form.
+ *
+ * @since 4.1.0
+ *
+ * @param WP_Post $post Post object.
+ */
+ do_action( 'edit_form_before_permalink', $post );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="inside">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-if ( $viewable ) :
- $sample_permalink_html = $post_type_object->public ? get_sample_permalink_html( $post->ID ) : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( $viewable ) :
+ $sample_permalink_html = $post_type_object->public ? get_sample_permalink_html( $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">- // As of 4.4, the Get Shortlink button is hidden by default.
- if ( has_filter( 'pre_get_shortlink' ) || has_filter( 'get_shortlink' ) ) {
- $shortlink = wp_get_shortlink( $post->ID, 'post' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // As of 4.4, the Get Shortlink button is hidden by default.
+ if ( has_filter( 'pre_get_shortlink' ) || has_filter( 'get_shortlink' ) ) {
+ $shortlink = wp_get_shortlink( $post->ID, 'post' );
</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( $shortlink ) && $shortlink !== $permalink && $permalink !== home_url( '?page_id=' . $post->ID ) ) {
- $sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr( $shortlink ) . '" /><button type="button" class="button button-small" onclick="prompt('URL:', jQuery(\'#shortlink\').val());">' . __( 'Get Shortlink' ) . '</button>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $shortlink ) && $shortlink !== $permalink && $permalink !== home_url( '?page_id=' . $post->ID ) ) {
+ $sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr( $shortlink ) . '" /><button type="button" class="button button-small" onclick="prompt('URL:', jQuery(\'#shortlink\').val());">' . __( 'Get Shortlink' ) . '</button>';
+ }
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $post_type_object->public && ! ( 'pending' == get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) ) ) {
- $has_sample_permalink = $sample_permalink_html && 'auto-draft' != $post->post_status;
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $post_type_object->public && ! ( 'pending' == get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) ) ) {
+ $has_sample_permalink = $sample_permalink_html && 'auto-draft' != $post->post_status;
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="edit-slug-box" class="hide-if-no-js">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- if ( $has_sample_permalink ) {
- echo $sample_permalink_html;
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( $has_sample_permalink ) {
+ echo $sample_permalink_html;
+ }
+ ?>
</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
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> endif;
</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"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- /titlediv -->
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires after the title field.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -691,41 +692,43 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $_wp_editor_expand ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_wp_editor_expand_class = ' wp-editor-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">-?>
</del><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="postdivrich" class="postarea<?php echo $_wp_editor_expand_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">-<?php
-wp_editor(
- $post->post_content, 'content', array(
- '_content_editor_dfw' => $_content_editor_dfw,
- 'drag_drop_upload' => true,
- 'tabfocus_elements' => 'content-html,save-post',
- 'editor_height' => 300,
- 'tinymce' => array(
- 'resize' => false,
- 'wp_autoresize_on' => $_wp_editor_expand,
- 'add_unload_trigger' => false,
- 'wp_keep_scroll_position' => ! $is_IE,
- ),
- )
-);
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ wp_editor(
+ $post->post_content,
+ 'content',
+ array(
+ '_content_editor_dfw' => $_content_editor_dfw,
+ 'drag_drop_upload' => true,
+ 'tabfocus_elements' => 'content-html,save-post',
+ 'editor_height' => 300,
+ 'tinymce' => array(
+ 'resize' => false,
+ 'wp_autoresize_on' => $_wp_editor_expand,
+ 'add_unload_trigger' => false,
+ 'wp_keep_scroll_position' => ! $is_IE,
+ ),
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <table id="post-status-info"><tbody><tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <td id="wp-word-count" class="hide-if-no-js"><?php printf( __( 'Word count: %s' ), '<span class="word-count">0</span>' ); ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> <td class="autosave-info">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="autosave-message"> </span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-if ( 'auto-draft' != $post->post_status ) {
- echo '<span id="last-edit">';
- if ( $last_user = get_userdata( get_post_meta( $post_ID, '_edit_last', true ) ) ) {
- /* translators: 1: Name of most recent post author, 2: Post edited date, 3: Post edited time */
- printf( __( 'Last edited by %1$s on %2$s at %3$s' ), esc_html( $last_user->display_name ), mysql2date( __( 'F j, Y' ), $post->post_modified ), mysql2date( __( 'g:i a' ), $post->post_modified ) );
- } else {
- /* translators: 1: Post edited date, 2: Post edited time */
- printf( __( 'Last edited on %1$s at %2$s' ), mysql2date( __( 'F j, Y' ), $post->post_modified ), mysql2date( __( 'g:i a' ), $post->post_modified ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( 'auto-draft' != $post->post_status ) {
+ echo '<span id="last-edit">';
+ if ( $last_user = get_userdata( get_post_meta( $post_ID, '_edit_last', true ) ) ) {
+ /* translators: 1: Name of most recent post author, 2: Post edited date, 3: Post edited time */
+ printf( __( 'Last edited by %1$s on %2$s at %3$s' ), esc_html( $last_user->display_name ), mysql2date( __( 'F j, Y' ), $post->post_modified ), mysql2date( __( 'g:i a' ), $post->post_modified ) );
+ } else {
+ /* translators: 1: Post edited date, 2: Post edited time */
+ printf( __( 'Last edited on %1$s at %2$s' ), mysql2date( __( 'F j, Y' ), $post->post_modified ), mysql2date( __( 'g:i a' ), $post->post_modified ) );
+ }
+ echo '</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">- echo '</span>';
-}
</del><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"> <td id="content-resize-handle" class="hide-if-no-js"><br /></td>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -732,7 +735,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </tr></tbody></table>
</span><span class="cx" style="display: block; padding: 0 10px">
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires after the content editor.
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/edit-form-comment.php 2018-08-17 01:50:26 UTC (rev 43571)
</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
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'approved' === wp_get_comment_status( $comment ) && $comment->comment_post_ID > 0 ) :
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_link = get_comment_link( $comment );
</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"> <div class="inside">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="comment-link-box">
</span><span class="cx" style="display: block; padding: 0 10px"> <strong><?php _ex( 'Permalink:', 'comment' ); ?></strong>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<label for="content" class="screen-reader-text">' . __( 'Comment' ) . '</label>';
</span><span class="cx" style="display: block; padding: 0 10px"> $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_editor(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment->comment_content, 'content', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment->comment_content,
+ 'content',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'media_buttons' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'tinymce' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'quicktags' => $quicktags_settings,
</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"> if ( $parent ) :
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_link = esc_url( get_comment_link( $parent ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $name = get_comment_author( $parent );
</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"> <div class="misc-pub-section misc-pub-reply-to">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</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"> </div>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> endif;
</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">@@ -226,5 +228,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> try{document.post.name.focus();}catch(e){}
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> endif;
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/edit-link-form.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'do_meta_boxes', 'link', 'side', $link );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_screen_option(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'layout_columns', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'layout_columns',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'max' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,7 +154,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"> if ( $link_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">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="action" value="save" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="link_id" value="<?php echo (int) $link_id; ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="cat_id" value="<?php echo (int) $cat_id; ?>" />
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/edit-tag-form.php 2018-08-17 01:50:26 UTC (rev 43571)
</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><a href="<?php echo esc_url( wp_validate_redirect( esc_url_raw( $wp_http_referer ), admin_url( 'term.php?taxonomy=' . $taxonomy ) ) ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> echo esc_html( $tax->labels->back_to_items );
</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"> </a></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -284,5 +284,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> try{document.forms.edittag.name.focus();}catch(e){}
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> endif;
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/edit-tags.php 2018-08-17 01:50:26 UTC (rev 43571)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> add_screen_option(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'per_page', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'per_page',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => 20,
</span><span class="cx" style="display: block; padding: 0 10px"> 'option' => 'edit_' . $tax->name . '_per_page',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,7 +96,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'error' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'message' => 4,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $referer
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $referer
</ins><span class="cx" style="display: block; 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,7 +189,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'error' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'message' => 5,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $referer
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $referer
</ins><span class="cx" style="display: 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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -337,8 +340,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $message ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="message" class="<?php echo $class; ?> notice is-dismissible"><p><?php echo $message; ?></p></div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'message', 'error' ), $_SERVER['REQUEST_URI'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'message', 'error' ), $_SERVER['REQUEST_URI'] );
</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"> <div id="ajax-response"></div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -401,27 +404,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy The taxonomy slug.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( "{$taxonomy}_pre_add_form", $taxonomy );
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="form-wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php echo $tax->labels->add_new_item; ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <form id="addtag" method="post" action="edit-tags.php" class="validate"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Fires inside the Add Tag form tag.
- *
- * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
- *
- * @since 3.7.0
- */
-do_action( "{$taxonomy}_term_new_form_tag" );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Fires inside the Add Tag form tag.
+ *
+ * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
+ *
+ * @since 3.7.0
+ */
+ do_action( "{$taxonomy}_term_new_form_tag" );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> >
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="action" value="add-tag" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="screen" value="<?php echo esc_attr( $current_screen->id ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="taxonomy" value="<?php echo esc_attr( $taxonomy ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="post_type" value="<?php echo esc_attr( $post_type ); ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php wp_nonce_field( 'add-tag', '_wpnonce_add-tag' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( 'add-tag', '_wpnonce_add-tag' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="form-field form-required term-name-wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="tag-name"><?php _ex( 'Name', 'term name' ); ?></label>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -428,7 +431,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="tag-name" id="tag-name" type="text" value="" size="40" aria-required="true" />
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'The name is how it appears on your site.' ); ?></p>
</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 ( ! global_terms_enabled() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! global_terms_enabled() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="form-field term-slug-wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="tag-slug"><?php _e( 'Slug' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="slug" id="tag-slug" type="text" value="" size="40" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -435,52 +438,52 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // global_terms_enabled() ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( is_taxonomy_hierarchical( $taxonomy ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( is_taxonomy_hierarchical( $taxonomy ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="form-field term-parent-wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="parent"><?php echo esc_html( $tax->labels->parent_item ); ?></label>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- $dropdown_args = array(
- 'hide_empty' => 0,
- 'hide_if_empty' => false,
- 'taxonomy' => $taxonomy,
- 'name' => 'parent',
- 'orderby' => 'name',
- 'hierarchical' => true,
- 'show_option_none' => __( 'None' ),
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $dropdown_args = array(
+ 'hide_empty' => 0,
+ 'hide_if_empty' => false,
+ 'taxonomy' => $taxonomy,
+ 'name' => 'parent',
+ 'orderby' => 'name',
+ 'hierarchical' => true,
+ 'show_option_none' => __( 'None' ),
+ );
</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 taxonomy parent drop-down on the Edit Term page.
- *
- * @since 3.7.0
- * @since 4.2.0 Added `$context` parameter.
- *
- * @param array $dropdown_args {
- * An array of taxonomy parent drop-down arguments.
- *
- * @type int|bool $hide_empty Whether to hide terms not attached to any posts. Default 0|false.
- * @type bool $hide_if_empty Whether to hide the drop-down if no terms exist. Default false.
- * @type string $taxonomy The taxonomy slug.
- * @type string $name Value of the name attribute to use for the drop-down select element.
- * Default 'parent'.
- * @type string $orderby The field to order by. Default 'name'.
- * @type bool $hierarchical Whether the taxonomy is hierarchical. Default true.
- * @type string $show_option_none Label to display if there are no terms. Default 'None'.
- * }
- * @param string $taxonomy The taxonomy slug.
- * @param string $context Filter context. Accepts 'new' or 'edit'.
- */
- $dropdown_args = apply_filters( 'taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'new' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Filters the taxonomy parent drop-down on the Edit Term page.
+ *
+ * @since 3.7.0
+ * @since 4.2.0 Added `$context` parameter.
+ *
+ * @param array $dropdown_args {
+ * An array of taxonomy parent drop-down arguments.
+ *
+ * @type int|bool $hide_empty Whether to hide terms not attached to any posts. Default 0|false.
+ * @type bool $hide_if_empty Whether to hide the drop-down if no terms exist. Default false.
+ * @type string $taxonomy The taxonomy slug.
+ * @type string $name Value of the name attribute to use for the drop-down select element.
+ * Default 'parent'.
+ * @type string $orderby The field to order by. Default 'name'.
+ * @type bool $hierarchical Whether the taxonomy is hierarchical. Default true.
+ * @type string $show_option_none Label to display if there are no terms. Default 'None'.
+ * }
+ * @param string $taxonomy The taxonomy slug.
+ * @param string $context Filter context. Accepts 'new' or 'edit'.
+ */
+ $dropdown_args = apply_filters( 'taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'new' );
</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_categories( $dropdown_args );
- ?>
- <?php if ( 'category' == $taxonomy ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_dropdown_categories( $dropdown_args );
+ ?>
+ <?php if ( 'category' == $taxonomy ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Assign a parent term to create a hierarchy. The term Jazz, for example, would be the parent of Bebop and Big Band.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endif; // is_taxonomy_hierarchical() ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endif; // is_taxonomy_hierarchical() ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="form-field term-description-wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="tag-description"><?php _e( 'Description' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea name="description" id="tag-description" rows="5" cols="40"></textarea>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -487,74 +490,74 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'The description is not prominent by default; however, some themes may show it.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-if ( ! is_taxonomy_hierarchical( $taxonomy ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( ! is_taxonomy_hierarchical( $taxonomy ) ) {
+ /**
+ * Fires after the Add Tag form fields for non-hierarchical taxonomies.
+ *
+ * @since 3.0.0
+ *
+ * @param string $taxonomy The taxonomy slug.
+ */
+ do_action( 'add_tag_form_fields', $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">- * Fires after the Add Tag form fields for non-hierarchical taxonomies.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires after the Add Term form fields.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
+ *
</ins><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"> * @param string $taxonomy The taxonomy 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">- do_action( 'add_tag_form_fields', $taxonomy );
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action( "{$taxonomy}_add_form_fields", $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">-/**
- * Fires after the Add Term form fields.
- *
- * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
- *
- * @since 3.0.0
- *
- * @param string $taxonomy The taxonomy slug.
- */
-do_action( "{$taxonomy}_add_form_fields", $taxonomy );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ submit_button( $tax->labels->add_new_item );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-submit_button( $tax->labels->add_new_item );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'category' == $taxonomy ) {
+ /**
+ * Fires at the end of the Edit Category form.
+ *
+ * @since 2.1.0
+ * @deprecated 3.0.0 Use {$taxonomy}_add_form instead.
+ *
+ * @param object $arg Optional arguments cast to an object.
+ */
+ do_action( 'edit_category_form', (object) array( 'parent' => 0 ) );
+ } elseif ( 'link_category' == $taxonomy ) {
+ /**
+ * Fires at the end of the Edit Link form.
+ *
+ * @since 2.3.0
+ * @deprecated 3.0.0 Use {$taxonomy}_add_form instead.
+ *
+ * @param object $arg Optional arguments cast to an object.
+ */
+ do_action( 'edit_link_category_form', (object) array( 'parent' => 0 ) );
+ } else {
+ /**
+ * Fires at the end of the Add Tag form.
+ *
+ * @since 2.7.0
+ * @deprecated 3.0.0 Use {$taxonomy}_add_form instead.
+ *
+ * @param string $taxonomy The taxonomy slug.
+ */
+ do_action( 'add_tag_form', $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">-if ( 'category' == $taxonomy ) {
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Fires at the end of the Edit Category form.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires at the end of the Add Term form for all taxonomies.
</ins><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.1.0
- * @deprecated 3.0.0 Use {$taxonomy}_add_form instead.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param object $arg Optional arguments cast to an object.
- */
- do_action( 'edit_category_form', (object) array( 'parent' => 0 ) );
-} elseif ( 'link_category' == $taxonomy ) {
- /**
- * Fires at the end of the Edit Link form.
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 2.3.0
- * @deprecated 3.0.0 Use {$taxonomy}_add_form instead.
- *
- * @param object $arg Optional arguments cast to an object.
- */
- do_action( 'edit_link_category_form', (object) array( 'parent' => 0 ) );
-} else {
- /**
- * Fires at the end of the Add Tag form.
- *
- * @since 2.7.0
- * @deprecated 3.0.0 Use {$taxonomy}_add_form instead.
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy The taxonomy 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">- do_action( 'add_tag_form', $taxonomy );
-}
-
-/**
- * Fires at the end of the Add Term form for all taxonomies.
- *
- * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
- *
- * @since 3.0.0
- *
- * @param string $taxonomy The taxonomy slug.
- */
-do_action( "{$taxonomy}_add_form", $taxonomy );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action( "{$taxonomy}_add_form", $taxonomy );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </form></div>
</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">@@ -587,15 +590,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"> </p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( current_user_can( 'import' ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( current_user_can( 'import' ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php printf( __( 'Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.' ), esc_url( $import_link ) ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endif; ?>
</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"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( 'post_tag' == $taxonomy && current_user_can( 'import' ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="form-wrap edit-term-notes">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php printf( __( 'Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>.' ), esc_url( $import_link ) ); ?></p>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -620,7 +623,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> try{document.forms.addtag['tag-name'].focus();}catch(e){}
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</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
</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"> $wp_list_table->inline_edit();
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/edit.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,7 +127,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'trashed' => $trashed,
</span><span class="cx" style="display: block; padding: 0 10px"> 'ids' => join( ',', $post_ids ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'locked' => $locked,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $sendback
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $sendback
</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 'untrash':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -290,7 +291,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"> add_screen_option(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'per_page', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'per_page',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => 20,
</span><span class="cx" style="display: block; padding: 0 10px"> 'option' => 'edit_' . $post_type . '_per_page',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunksrcwpadminexportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/export.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/export.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/export.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> * @since 3.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function export_add_js() {
</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"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> jQuery(document).ready(function($){
</span><span class="cx" style="display: block; padding: 0 10px"> var form = $('#export-filters'),
</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"> </script>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_head', 'export_add_js' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +144,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> FROM $wpdb->posts
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE post_type = %s AND post_status != 'auto-draft'
</span><span class="cx" style="display: block; padding: 0 10px"> ORDER BY post_date DESC
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ", $post_type
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ",
+ $post_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">@@ -224,7 +225,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $post_stati = get_post_stati( array( 'internal' => false ), 'objects' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $post_stati as $status ) :
</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"> <option value="<?php echo esc_attr( $status->name ); ?>"><?php echo esc_html( $status->label ); ?></option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,9 +281,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'can_export' => true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'objects'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'objects'
</ins><span class="cx" style="display: block; padding: 0 10px"> ) as $post_type ) :
</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"> <p><label><input type="radio" name="content" value="<?php echo esc_attr( $post_type->name ); ?>" /> <?php echo esc_html( $post_type->label ); ?></label></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/import.php 2018-08-17 01:50:26 UTC (rev 43571)
</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
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: importer slug */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'The %s importer is invalid or is not installed.' ), '<strong>' . esc_html( $_GET['invalid'] ) . '</strong>' );
</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"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . __( 'No importers are available.' ) . '</p>'; // TODO: make more helpful
</span><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><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"> <table class="widefat importers striped">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,8 +119,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'activate',
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin' => $plugin_file,
</span><span class="cx" style="display: block; padding: 0 10px"> 'from' => 'import',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), admin_url( 'plugins.php' )
- ), 'activate-plugin_' . $plugin_file
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ admin_url( 'plugins.php' )
+ ),
+ 'activate-plugin_' . $plugin_file
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $action = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%s" aria-label="%s">%s</a>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,8 +144,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'install-plugin',
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin' => $plugin_slug,
</span><span class="cx" style="display: block; padding: 0 10px"> 'from' => 'import',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), self_admin_url( 'update.php' )
- ), 'install-plugin_' . $plugin_slug
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ self_admin_url( 'update.php' )
+ ),
+ 'install-plugin_' . $plugin_slug
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $action = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%1$s" class="install-now" data-slug="%2$s" data-name="%3$s" aria-label="%4$s">%5$s</a>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,7 +170,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'import' => $importer_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), self_admin_url( 'admin.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ self_admin_url( 'admin.php' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $action = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%1$s" aria-label="%2$s">%3$s</a>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +193,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'TB_iframe' => 'true',
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 600,
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => 550,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), network_admin_url( 'plugin-install.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ network_admin_url( 'plugin-install.php' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $action .= sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> ' | <a href="%1$s" class="thickbox open-plugin-details-modal" aria-label="%2$s">%3$s</a>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -212,7 +218,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</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
</ins><span class="cx" style="display: 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( 'install_plugins' ) ) {
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -514,7 +514,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_terms_checklist(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $taxonomy->name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'descendants_and_self' => $cat_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'selected_cats' => $checked_categories,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -547,7 +548,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_terms_checklist(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $taxonomy->name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'descendants_and_self' => $term_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'selected_cats' => $checked_categories,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -998,7 +1000,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"> $tags = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'number' => 45,
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'count',
</span><span class="cx" style="display: block; padding: 0 10px"> 'order' => 'DESC',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1020,7 +1023,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We need raw tag names here, so don't filter the output
</span><span class="cx" style="display: block; padding: 0 10px"> $return = wp_generate_tag_cloud(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tags, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tags,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'filter' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'format' => 'list',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1460,7 +1464,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_key' => $key,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_value' => $value,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_id' => $mid,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $c
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $c
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'position' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'supplemental' => array( 'postid' => $meta->post_id ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1625,7 +1630,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $item = apply_filters( 'nav_menu_meta_box_object', $menus_meta_box_object );
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> call_user_func_array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $callback, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $callback,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> null,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'add-' . $item->name,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3166,7 +3172,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_unslash( $_REQUEST['request'] ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_unslash( $_REQUEST['request'] ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'per_page' => 20,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => $theme_field_defaults,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3196,7 +3203,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme' => $theme->slug,
</span><span class="cx" style="display: block; padding: 0 10px"> '_wpnonce' => wp_create_nonce( 'install-theme_' . $theme->slug ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $update_php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $update_php
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'switch_themes' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3206,7 +3214,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'enable',
</span><span class="cx" style="display: block; padding: 0 10px"> '_wpnonce' => wp_create_nonce( 'enable-theme_' . $theme->slug ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme' => $theme->slug,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), network_admin_url( 'themes.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ network_admin_url( 'themes.php' )
</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"> $theme->activate_url = add_query_arg(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3214,7 +3223,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'activate',
</span><span class="cx" style="display: block; padding: 0 10px"> '_wpnonce' => wp_create_nonce( 'switch-theme_' . $theme->slug ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'stylesheet' => $theme->slug,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), admin_url( 'themes.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ admin_url( 'themes.php' )
</ins><span class="cx" style="display: block; 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">@@ -3223,7 +3233,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $theme->customize_url = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'return' => urlencode( network_admin_url( 'theme-install.php', 'relative' ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), wp_customize_url( $theme->slug )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ wp_customize_url( $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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3666,7 +3677,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> include_once( ABSPATH . 'wp-admin/includes/theme.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $api = themes_api(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'theme_information', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'theme_information',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => $slug,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => array( 'sections' => false ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3719,7 +3731,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'enable',
</span><span class="cx" style="display: block; padding: 0 10px"> '_wpnonce' => wp_create_nonce( 'enable-theme_' . $slug ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme' => $slug,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), network_admin_url( 'themes.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ network_admin_url( 'themes.php' )
</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"> $status['activateUrl'] = add_query_arg(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3727,7 +3740,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'activate',
</span><span class="cx" style="display: block; padding: 0 10px"> '_wpnonce' => wp_create_nonce( 'switch-theme_' . $slug ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'stylesheet' => $slug,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), admin_url( 'themes.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ admin_url( 'themes.php' )
</ins><span class="cx" style="display: block; 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">@@ -3736,7 +3750,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $status['customizeUrl'] = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'return' => urlencode( network_admin_url( 'theme-install.php', 'relative' ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), wp_customize_url( $slug )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ wp_customize_url( $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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3950,7 +3965,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $api = plugins_api(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'plugin_information', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'plugin_information',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => sanitize_key( wp_unslash( $_POST['slug'] ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'sections' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4010,7 +4026,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '_wpnonce' => wp_create_nonce( 'activate-plugin_' . $install_status['file'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'activate',
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin' => $install_status['file'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $plugins_url
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $plugins_url
</ins><span class="cx" style="display: block; 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">@@ -4220,7 +4237,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** @var WP_Plugins_List_Table $wp_list_table */
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_list_table = _get_list_table(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'WP_Plugins_List_Table', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'WP_Plugins_List_Table',
+ array(
</ins><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"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4235,11 +4253,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Set the correct requester, so pagination works.
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array_diff_key(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_POST, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_POST,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> '_ajax_nonce' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> '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">- ), network_admin_url( 'plugins.php', 'relative' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ network_admin_url( 'plugins.php', 'relative' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['s'] = wp_unslash( $_POST['s'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4269,7 +4289,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** @var WP_Plugin_Install_List_Table $wp_list_table */
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_list_table = _get_list_table(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'WP_Plugin_Install_List_Table', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'WP_Plugin_Install_List_Table',
+ array(
</ins><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"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4284,11 +4305,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Set the correct requester, so pagination works.
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array_diff_key(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_POST, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_POST,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> '_ajax_nonce' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> '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">- ), network_admin_url( 'plugin-install.php', 'relative' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ network_admin_url( 'plugin-install.php', 'relative' )
</ins><span class="cx" style="display: 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_list_table->prepare_items();
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-automatic-upgrader-skin.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,7 +83,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Only allow basic HTML in the messages, as it'll be used in emails/logs rather than direct browser output.
</span><span class="cx" style="display: block; padding: 0 10px"> $string = wp_kses(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $string, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $string,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'a' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'href' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasscoreupgraderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-core-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-core-upgrader.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-core-upgrader.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,7 +180,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $original_result = $result;
</span><span class="cx" style="display: block; padding: 0 10px"> $result = new WP_Error(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'rollback_was_required', $this->strings['rollback_was_required'], (object) array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'rollback_was_required',
+ $this->strings['rollback_was_required'],
+ (object) array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'update' => $original_result,
</span><span class="cx" style="display: block; padding: 0 10px"> 'rollback' => $rollback_result,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,10 +191,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"> /** This action is documented in wp-admin/includes/class-wp-upgrader.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( 'upgrader_process_complete', $this, array(
- 'action' => 'update',
- 'type' => 'core',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action(
+ 'upgrader_process_complete',
+ $this,
+ array(
+ 'action' => 'update',
+ 'type' => 'core',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clear the current updates
</span><span class="cx" style="display: block; padding: 0 10px"> delete_site_transient( 'update_core' );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-language-pack-upgrader.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,12 +275,16 @@
</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><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-admin/includes/class-wp-upgrader.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( 'upgrader_process_complete', $this, array(
- 'action' => 'update',
- 'type' => 'translation',
- 'bulk' => true,
- 'translations' => $language_updates_results,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action(
+ 'upgrader_process_complete',
+ $this,
+ array(
+ 'action' => 'update',
+ 'type' => 'translation',
+ 'bulk' => true,
+ 'translations' => $language_updates_results,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Re-add upgrade hooks.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -337,7 +341,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $mo || ! $po ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'incompatible_archive_pomo', $this->strings['incompatible_archive'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'incompatible_archive_pomo',
+ $this->strings['incompatible_archive'],
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: .po, 2: .mo */
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The language pack is missing either the %1$s or %2$s files.' ),
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-plugin-upgrader.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,12 +306,16 @@
</span><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"> /** This action is documented in wp-admin/includes/class-wp-upgrader.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( 'upgrader_process_complete', $this, array(
- 'action' => 'update',
- 'type' => 'plugin',
- 'bulk' => true,
- 'plugins' => $plugins,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action(
+ 'upgrader_process_complete',
+ $this,
+ array(
+ 'action' => 'update',
+ 'type' => 'plugin',
+ 'bulk' => true,
+ 'plugins' => $plugins,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->skin->bulk_footer();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassthemeinstallerskinphp"></a>
<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-installer-skin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-theme-installer-skin.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-theme-installer-skin.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +67,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'activate',
</span><span class="cx" style="display: block; padding: 0 10px"> 'template' => urlencode( $template ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'stylesheet' => urlencode( $stylesheet ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), admin_url( 'themes.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ admin_url( 'themes.php' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $stylesheet );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassthemeupgraderskinphp"></a>
<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-skin.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-skin.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-theme-upgrader-skin.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'activate',
</span><span class="cx" style="display: block; padding: 0 10px"> 'template' => urlencode( $template ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'stylesheet' => urlencode( $stylesheet ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), admin_url( 'themes.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ admin_url( 'themes.php' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $stylesheet );
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-theme-upgrader.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +111,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We don't have the parent theme, let's install it.
</span><span class="cx" style="display: block; padding: 0 10px"> $api = themes_api(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'theme_information', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'theme_information',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => $theme_info->get( 'Template' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'sections' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -418,7 +419,9 @@
</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="cx" style="display: block; padding: 0 10px"> do_action(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'upgrader_process_complete', $this, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'upgrader_process_complete',
+ $this,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'update',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'theme',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bulk' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -468,7 +471,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // A proper archive should have a style.css file in the single subdirectory
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'incompatible_archive_theme_no_style', $this->strings['incompatible_archive'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'incompatible_archive_theme_no_style',
+ $this->strings['incompatible_archive'],
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: style.css */
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The theme is missing the %s stylesheet.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -478,7 +482,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"> $info = get_file_data(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $working_directory . 'style.css', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $working_directory . 'style.css',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'Name' => 'Theme Name',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Template' => 'Template',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -486,7 +491,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $info['Name'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'incompatible_archive_theme_no_name', $this->strings['incompatible_archive'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'incompatible_archive_theme_no_name',
+ $this->strings['incompatible_archive'],
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: style.css */
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The %s stylesheet doesn’t contain a valid theme header.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -498,7 +504,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If it's not a child theme, it must have at least an index.php to be legit.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $info['Template'] ) && ! file_exists( $working_directory . 'index.php' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'incompatible_archive_theme_no_index', $this->strings['incompatible_archive'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'incompatible_archive_theme_no_index',
+ $this->strings['incompatible_archive'],
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: index.php */
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The theme is missing the %s file.' ),
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswalkernavmenueditphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <a class="item-edit" id="edit-<?php echo $item_id; ?>" href="
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> echo ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? admin_url( 'nav-menus.php' ) : add_query_arg( 'edit-menu-item', $item_id, remove_query_arg( $removed_args, admin_url( 'nav-menus.php#menu-item-settings-' . $item_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">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> " aria-label="<?php esc_attr_e( 'Edit menu item' ); ?>"><span class="screen-reader-text"><?php _e( 'Edit' ); ?></span></a>
</span><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</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"> 'delete-menu_item_' . $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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> "><?php _e( 'Remove' ); ?></a> <span class="meta-sep hide-if-no-js"> | </span> <a class="item-cancel submitcancel hide-if-no-js" id="cancel-<?php echo $item_id; ?>" href="
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> echo esc_url(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,10 +240,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit-menu-item' => $item_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'cancel' => time(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), admin_url( 'nav-menus.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ admin_url( 'nav-menus.php' )
</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> #menu-item-settings-<?php echo $item_id; ?>"><?php _e( 'Cancel' ); ?></a>
</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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-wp-automatic-updater.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -336,7 +336,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Boom, This sites about to get a whole new splash of paint!
</span><span class="cx" style="display: block; padding: 0 10px"> $upgrade_result = $upgrader->upgrade(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $upgrader_item, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $upgrader_item,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'clear_update_cache' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> // Always use partial builds if possible for core updates.
</span><span class="cx" style="display: block; padding: 0 10px"> 'pre_check_md5' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -574,7 +575,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"> update_site_option(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'auto_core_update_failed', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'auto_core_update_failed',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'attempted' => $core_update->current,
</span><span class="cx" style="display: block; padding: 0 10px"> 'current' => $wp_version,
</span><span class="cx" style="display: block; padding: 0 10px"> 'error_code' => $error_code,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -600,7 +602,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function send_email( $type, $core_update, $result = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_site_option(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'auto_core_update_notified', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'auto_core_update_notified',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => $type,
</span><span class="cx" style="display: block; padding: 0 10px"> 'email' => get_site_option( 'admin_email' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'version' => $core_update->current,
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,7 +158,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $total_comments = get_comments(
</span><span class="cx" style="display: block; padding: 0 10px"> array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'count' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'offset' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'number' => 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,7 +225,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ), // singular not used
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: current user's comments count */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mine' => _nx_noop(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mine' => _nx_noop(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'Mine <span class="count">(%s)</span>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Mine <span class="count">(%s)</span>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comments'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -277,11 +278,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'mine' === $status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $current_user_id = get_current_user_id();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $num_comments->mine = get_comments( array(
- 'user_id' => $current_user_id,
- 'count' => true,
- ) );
- $link = add_query_arg( 'user_id', $current_user_id, $link );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $num_comments->mine = get_comments(
+ array(
+ 'user_id' => $current_user_id,
+ 'count' => true,
+ )
+ );
+ $link = add_query_arg( 'user_id', $current_user_id, $link );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $link = remove_query_arg( 'user_id', $link );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -367,49 +370,50 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $has_items ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $has_items = $this->has_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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="alignleft actions">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-if ( 'top' === $which ) {
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( 'top' === $which ) {
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <label class="screen-reader-text" for="filter-by-comment-type"><?php _e( 'Filter by comment type' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <select id="filter-by-comment-type" name="comment_type">
</span><span class="cx" style="display: block; padding: 0 10px"> <option value=""><?php _e( 'All comment types' ); ?></option>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
- /**
- * Filters the comment types dropdown menu.
- *
- * @since 2.7.0
- *
- * @param string[] $comment_types An array of comment types. Accepts 'Comments', 'Pings'.
- */
- $comment_types = apply_filters(
- 'admin_comment_types_dropdown', array(
- 'comment' => __( 'Comments' ),
- 'pings' => __( 'Pings' ),
- )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Filters the comment types dropdown menu.
+ *
+ * @since 2.7.0
+ *
+ * @param string[] $comment_types An array of comment types. Accepts 'Comments', 'Pings'.
+ */
+ $comment_types = apply_filters(
+ 'admin_comment_types_dropdown',
+ array(
+ 'comment' => __( 'Comments' ),
+ 'pings' => __( '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">-foreach ( $comment_types as $type => $label ) {
- echo "\t" . '<option value="' . esc_attr( $type ) . '"' . selected( $comment_type, $type, false ) . ">$label</option>\n";
-}
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $comment_types as $type => $label ) {
+ echo "\t" . '<option value="' . esc_attr( $type ) . '"' . selected( $comment_type, $type, false ) . ">$label</option>\n";
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
- /**
- * Fires just before the Filter submit button for comment types.
- *
- * @since 3.5.0
- */
- do_action( 'restrict_manage_comments' );
- submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Fires just before the Filter submit button for comment types.
+ *
+ * @since 3.5.0
+ */
+ do_action( 'restrict_manage_comments' );
+ submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+ }
</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 ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_user_can( 'moderate_comments' ) && $has_items ) {
- wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
- $title = ( 'spam' === $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' );
- submit_button( $title, 'apply', 'delete_all', false );
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_user_can( 'moderate_comments' ) && $has_items ) {
+ wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
+ $title = ( 'spam' === $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' );
+ submit_button( $title, 'apply', 'delete_all', false );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires after the Filter submit button for comment types.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -490,7 +494,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->screen->render_screen_reader_content( 'heading_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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <table class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <thead>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -516,7 +520,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </tfoot>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</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
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->display_tablenav( 'bottom' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -676,10 +680,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function column_cb( $comment ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->user_can ) {
</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"> <label class="screen-reader-text" for="cb-select-<?php echo $comment->comment_ID; ?>"><?php _e( 'Select comment' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input id="cb-select-<?php echo $comment->comment_ID; ?>" type="checkbox" name="delete_comments[]" value="<?php echo $comment->comment_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
</ins><span class="cx" style="display: block; 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">@@ -709,7 +713,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->user_can ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/comment.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_content = apply_filters( 'comment_edit_pre', $comment->comment_content );
</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"> <div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden">
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea class="comment" rows="1" cols="1"><?php echo esc_textarea( $comment_content ); ?></textarea>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="author-email"><?php echo esc_attr( $comment->comment_author_email ); ?></div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -717,7 +721,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="author-url"><?php echo esc_attr( $comment->comment_author_url ); ?></div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="comment_status"><?php echo $comment->comment_approved; ?></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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -759,7 +763,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 's' => $author_ip,
</span><span class="cx" style="display: block; padding: 0 10px"> 'mode' => 'detail',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), admin_url( 'edit-comments.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ admin_url( 'edit-comments.php' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'spam' === $comment_status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $author_ip_url = add_query_arg( 'comment_status', 'spam', $author_ip_url );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-wp-internal-pointers.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,8 +180,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"> $js_args = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'content' => $content,
- 'position' => $position,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'content' => $content,
+ 'position' => $position,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'pointerClass' => 'wp-pointer arrow-bottom',
</span><span class="cx" style="display: block; padding: 0 10px"> 'pointerWidth' => 420,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswplinkslisttablephp"></a>
<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-links-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-links-list-table.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-wp-links-list-table.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,9 +100,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'top' != $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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="alignleft actions">
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> $dropdown_options = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'selected' => $cat_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'cat_id',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,9 +117,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<label class="screen-reader-text" for="cat_id">' . __( 'Filter by category' ) . '</label>';
</span><span class="cx" style="display: block; padding: 0 10px"> wp_dropdown_categories( $dropdown_options );
</span><span class="cx" style="display: block; padding: 0 10px"> submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
</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"> </div>
</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
</ins><span class="cx" style="display: block; 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">@@ -293,11 +293,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $link = sanitize_bookmark( $link );
</span><span class="cx" style="display: block; padding: 0 10px"> $link->link_name = esc_attr( $link->link_name );
</span><span class="cx" style="display: block; padding: 0 10px"> $link->link_category = wp_get_link_cats( $link->link_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">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr id="link-<?php echo $link->link_id; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->single_row_columns( $link ); ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-wp-list-table.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,7 +137,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct( $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'plural' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'singular' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'ajax' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,7 +275,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function set_pagination_args( $args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'total_items' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'total_pages' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'per_page' => 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -360,13 +362,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_REQUEST['detached'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<input type="hidden" name="detached" value="' . esc_attr( $_REQUEST['detached'] ) . '" />';
</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"> <p class="search-box">
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="screen-reader-text" for="<?php echo esc_attr( $input_id ); ?>"><?php echo $text; ?>:</label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="search" id="<?php echo esc_attr( $input_id ); ?>" name="s" value="<?php _admin_search_query(); ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php submit_button( $text, '', '', false, array( 'id' => 'search-submit' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( $text, '', '', false, array( 'id' => 'search-submit' ) ); ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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,7 +570,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE post_type = %s
</span><span class="cx" style="display: block; padding: 0 10px"> $extra_checks
</span><span class="cx" style="display: block; padding: 0 10px"> ORDER BY post_date DESC
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ", $post_type
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ",
+ $post_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">@@ -589,30 +592,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"> $m = isset( $_GET['m'] ) ? (int) $_GET['m'] : 0;
</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"> <label for="filter-by-date" class="screen-reader-text"><?php _e( 'Filter by date' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <select name="m" id="filter-by-date">
</span><span class="cx" style="display: block; padding: 0 10px"> <option<?php selected( $m, 0 ); ?> value="0"><?php _e( 'All dates' ); ?></option>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-foreach ( $months as $arc_row ) {
- if ( 0 == $arc_row->year ) {
- continue;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ foreach ( $months as $arc_row ) {
+ if ( 0 == $arc_row->year ) {
+ 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">- $month = zeroise( $arc_row->month, 2 );
- $year = $arc_row->year;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $month = zeroise( $arc_row->month, 2 );
+ $year = $arc_row->year;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf(
- "<option %s value='%s'>%s</option>\n",
- selected( $m, $year . $month, false ),
- esc_attr( $arc_row->year . $month ),
- /* translators: 1: month name, 2: 4-digit year */
- sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $month ), $year )
- );
-}
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ "<option %s value='%s'>%s</option>\n",
+ selected( $m, $year . $month, false ),
+ esc_attr( $arc_row->year . $month ),
+ /* translators: 1: month name, 2: 4-digit year */
+ sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $month ), $year )
+ );
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </select>
</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
</ins><span class="cx" style="display: block; 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">@@ -623,25 +626,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $current_mode
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function view_switcher( $current_mode ) {
</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"> <input type="hidden" name="mode" value="<?php echo esc_attr( $current_mode ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="view-switch">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-foreach ( $this->modes as $mode => $title ) {
- $classes = array( 'view-' . $mode );
- if ( $current_mode === $mode ) {
- $classes[] = 'current';
- }
- printf(
- "<a href='%s' class='%s' id='view-switch-$mode'><span class='screen-reader-text'>%s</span></a>\n",
- esc_url( add_query_arg( 'mode', $mode ) ),
- implode( ' ', $classes ),
- $title
- );
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ foreach ( $this->modes as $mode => $title ) {
+ $classes = array( 'view-' . $mode );
+ if ( $current_mode === $mode ) {
+ $classes[] = 'current';
+ }
+ printf(
+ "<a href='%s' class='%s' id='view-switch-$mode'><span class='screen-reader-text'>%s</span></a>\n",
+ esc_url( add_query_arg( 'mode', $mode ) ),
+ implode( ' ', $classes ),
+ $title
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -677,7 +680,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'p' => $post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_status' => 'approved',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), admin_url( 'edit-comments.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ admin_url( 'edit-comments.php' )
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $approved_comments_number,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -699,7 +703,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'p' => $post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_status' => 'moderated',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), admin_url( 'edit-comments.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ admin_url( 'edit-comments.php' )
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $pending_comments_number,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1152,7 +1157,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->display_tablenav( 'top' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->screen->render_screen_reader_content( 'heading_list' );
</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"> <table class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <thead>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1161,10 +1166,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </thead>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <tbody id="the-list"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- if ( $singular ) {
- echo " data-wp-lists='list:$singular'";
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( $singular ) {
+ echo " data-wp-lists='list:$singular'";
+ }
</ins><span class="cx" style="display: 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 $this->display_rows_or_placeholder(); ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1177,7 +1182,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </tfoot>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->display_tablenav( 'bottom' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1209,7 +1214,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="alignleft actions bulkactions">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->bulk_actions( $which ); ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->extra_tablenav( $which );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->pagination( $which );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1217,7 +1222,7 @@
</span><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><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
</ins><span class="cx" style="display: block; 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="trunksrcwpadminincludesclasswpmedialisttablephp"></a>
<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-media-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-media-list-table.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-wp-media-list-table.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,26 +171,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'bar' !== $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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="actions">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-if ( ! is_singular() ) {
- if ( ! $this->is_trash ) {
- $this->months_dropdown( 'attachment' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( ! is_singular() ) {
+ if ( ! $this->is_trash ) {
+ $this->months_dropdown( 'attachment' );
+ }
</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( 'restrict_manage_posts', $this->screen->post_type, $which );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */
+ do_action( 'restrict_manage_posts', $this->screen->post_type, $which );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+ }
</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 ( $this->is_trash && current_user_can( 'edit_others_posts' ) && $this->has_items() ) {
- submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $this->is_trash && current_user_can( 'edit_others_posts' ) && $this->has_items() ) {
+ submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -236,7 +236,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $views = $this->get_views();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->screen->render_screen_reader_content( 'heading_views' );
</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"> <div class="wp-filter">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="filter-items">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->view_switcher( $mode ); ?>
</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"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->extra_tablenav( 'bar' );
</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/inclues/class-wp-list-table.php */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -259,14 +259,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $views = apply_filters( "views_{$this->screen->id}", array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Back compat for pre-4.0 view links.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! empty( $views ) ) {
- echo '<ul class="filter-links">';
- foreach ( $views as $class => $view ) {
- echo "<li class='$class'>$view</li>";
- }
- echo '</ul>';
-}
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $views ) ) {
+ echo '<ul class="filter-links">';
+ foreach ( $views as $class => $view ) {
+ echo "<li class='$class'>$view</li>";
+ }
+ echo '</ul>';
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="search-form">
</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"> <label for="media-search-input" class="screen-reader-text"><?php esc_html_e( 'Search Media' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="search" placeholder="<?php esc_attr_e( 'Search media items...' ); ?>" id="media-search-input" class="search" name="s" value="<?php _admin_search_query(); ?>"></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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -354,14 +354,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function column_cb( $post ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'edit_post', $post->ID ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <label class="screen-reader-text" for="cb-select-<?php echo $post->ID; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> echo sprintf( __( 'Select %s' ), _draft_or_post_title() );
</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"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="checkbox" name="media[]" id="cb-select-<?php echo $post->ID; ?>" value="<?php echo $post->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
</ins><span class="cx" style="display: block; 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">@@ -395,9 +395,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> echo $link_start;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $thumb ) :
</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"> <span class="media-icon <?php echo sanitize_html_class( $mime . '-icon' ); ?>"><?php echo $thumb; ?></span>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px"> echo $title . $link_end;
</span><span class="cx" style="display: block; padding: 0 10px"> _media_states( $post );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -487,12 +487,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $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 ( $parent_type && $parent_type->show_ui && current_user_can( 'edit_post', $post->post_parent ) ) {
</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"> <strong><a href="<?php echo get_edit_post_link( $post->post_parent ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $title; ?></a></strong>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $parent_type && current_user_can( 'read_post', $post->post_parent ) ) {
</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"> <strong><?php echo $title; ?></strong>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -505,7 +505,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent_post_id' => $post->post_parent,
</span><span class="cx" style="display: block; padding: 0 10px"> 'media[]' => $post->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> '_wpnonce' => wp_create_nonce( 'bulk-' . $this->_args['plural'] ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'upload.php'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'upload.php'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<br /><a href="%s" class="hide-if-no-js detach-from-parent" aria-label="%s">%s</a>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -631,11 +632,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $post_owner = ( get_current_user_id() == $post->post_author ) ? 'self' : 'other';
</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"> <tr id="post-<?php echo $post->ID; ?>" class="<?php echo trim( ' author-' . $post_owner . ' status-' . $post->post_status ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->single_row_columns( $post ); ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,7 +176,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $total_sites = get_sites(
</span><span class="cx" style="display: block; padding: 0 10px"> array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'count' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'offset' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'number' => 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,14 +276,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function column_cb( $blog ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_main_site( $blog['blog_id'] ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> $blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
</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"> <label class="screen-reader-text" for="blog_<?php echo $blog['blog_id']; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Select %s' ), $blogname );
</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"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="checkbox" id="blog_<?php echo $blog['blog_id']; ?>" name="allblogs[]" value="<?php echo esc_attr( $blog['blog_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
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -406,12 +407,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function column_users( $blog ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user_count = wp_cache_get( $blog['blog_id'] . '_user_count', 'blog-details' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $user_count ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_users = new WP_User_Query( array(
- 'blog_id' => $blog['blog_id'],
- 'fields' => 'ID',
- 'number' => 1,
- 'count_total' => true,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_users = new WP_User_Query(
+ array(
+ 'blog_id' => $blog['blog_id'],
+ 'fields' => 'ID',
+ 'number' => 1,
+ 'count_total' => true,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_count = $blog_users->get_total();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( $blog['blog_id'] . '_user_count', $user_count, 'blog-details', 12 * HOUR_IN_SECONDS );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmsthemeslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,7 +153,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $total_this_page = $totals[ $status ];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'updates', '_wpUpdatesItemCounts', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'updates',
+ '_wpUpdatesItemCounts',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'themes' => $totals,
</span><span class="cx" style="display: block; padding: 0 10px"> 'totals' => wp_get_update_data(),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -423,7 +425,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme' => $theme_key,
</span><span class="cx" style="display: block; padding: 0 10px"> 'paged' => $page,
</span><span class="cx" style="display: block; padding: 0 10px"> 's' => $s,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $url
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $url
</ins><span class="cx" style="display: 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_site_themes ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -448,7 +451,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme' => $theme_key,
</span><span class="cx" style="display: block; padding: 0 10px"> 'paged' => $page,
</span><span class="cx" style="display: block; padding: 0 10px"> 's' => $s,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $url
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $url
</ins><span class="cx" style="display: 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_site_themes ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -475,7 +479,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_status' => $context,
</span><span class="cx" style="display: block; padding: 0 10px"> 'paged' => $page,
</span><span class="cx" style="display: block; padding: 0 10px"> 's' => $s,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'themes.php'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'themes.php'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: theme name */
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,10 +143,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $installed_plugins = $this->get_installed_plugins();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'page' => $paged,
- 'per_page' => $per_page,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'page' => $paged,
+ 'per_page' => $per_page,
</ins><span class="cx" style="display: block; padding: 0 10px"> // Send the locale to the API so it can provide context-sensitive results.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'locale' => get_user_locale(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'locale' => get_user_locale(),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $tab ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,7 +256,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"> wp_localize_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'updates', '_wpUpdatesItemCounts', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'updates',
+ '_wpUpdatesItemCounts',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'plugins' => $js_plugins,
</span><span class="cx" style="display: block; padding: 0 10px"> 'totals' => wp_get_update_data(),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -273,7 +275,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } else { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="no-plugin-results"><?php _e( 'No plugins found. Try a different search.' ); ?></div>
</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
</ins><span class="cx" style="display: block; 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">@@ -308,7 +310,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $views = apply_filters( "views_{$this->screen->id}", $views );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->screen->render_screen_reader_content( 'heading_views' );
</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"> <div class="wp-filter">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul class="filter-links">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,9 +323,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</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 install_search_form(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php install_search_form(); ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -340,16 +342,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->display_tablenav( 'top' );
</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"> <div class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
- $this->screen->render_screen_reader_content( 'heading_list' );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $this->screen->render_screen_reader_content( 'heading_list' );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="the-list"<?php echo $data_attr; ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->display_rows_or_placeholder(); ?>
</span><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">-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->display_tablenav( 'bottom' );
</span><span class="cx" style="display: block; padding: 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 +367,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'top' === $which ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_referer_field();
</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"> <div class="tablenav top">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="alignleft actions">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -385,7 +387,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->pagination( $which ); ?>
</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><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
</ins><span class="cx" style="display: block; 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">@@ -560,7 +562,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '_wpnonce' => wp_create_nonce( 'activate-plugin_' . $status['file'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'activate',
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin' => $status['file'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), network_admin_url( 'plugins.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ network_admin_url( 'plugins.php' )
</ins><span class="cx" style="display: 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_network_admin() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -621,7 +624,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $action_links = apply_filters( 'plugin_install_action_links', $action_links, $plugin );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $last_updated_timestamp = strtotime( $plugin['last_updated'] );
</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"> <div class="plugin-card plugin-card-<?php echo sanitize_html_class( $plugin['slug'] ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $compatible_php || ! $compatible_wp ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -651,7 +654,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self_admin_url( 'update-core.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">- } elseif ( ! $compatible_php ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! $compatible_php ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _e( 'This plugin doesn’t work with your version of PHP. ' );
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: "Updating PHP" page URL */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -703,7 +706,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $plugin['active_installs'] >= 1000000 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $active_installs_millions = floor( $plugin['active_installs'] / 1000000 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $active_installs_text = sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $active_installs_text = sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> _nx( '%s+ Million', '%s+ Million', $active_installs_millions, 'Active plugin installations' ),
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $active_installs_millions )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -728,7 +731,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"> </div>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Close off the group divs of the last one
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,7 +256,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"> wp_localize_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'updates', '_wpUpdatesItemCounts', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'updates',
+ '_wpUpdatesItemCounts',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'plugins' => $js_plugins,
</span><span class="cx" style="display: block; padding: 0 10px"> 'totals' => wp_get_update_data(),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppostcommentslisttablephp"></a>
<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-post-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-post-comments-list-table.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-wp-post-comments-list-table.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,13 +49,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $singular = $this->_args['singular'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_field( 'fetch-list-' . get_class( $this ), '_ajax_fetch_list_nonce' );
</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"> <table class="<?php echo implode( ' ', $this->get_table_classes() ); ?>" style="display:none;">
</span><span class="cx" style="display: block; padding: 0 10px"> <tbody id="the-comment-list"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- if ( $singular ) {
- echo " data-wp-lists='list:$singular'";
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( $singular ) {
+ echo " data-wp-lists='list:$singular'";
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> >
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><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"> </tbody>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</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
</ins><span class="cx" style="display: block; 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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +98,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE post_type = %s
</span><span class="cx" style="display: block; padding: 0 10px"> AND post_status NOT IN ( '" . implode( "','", $exclude_states ) . "' )
</span><span class="cx" style="display: block; padding: 0 10px"> AND post_author = %d
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ", $post_type, get_current_user_id()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ",
+ $post_type,
+ get_current_user_id()
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -460,46 +462,46 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $which
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function extra_tablenav( $which ) {
</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"> <div class="alignleft actions">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-if ( 'top' === $which && ! is_singular() ) {
- ob_start();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( 'top' === $which && ! is_singular() ) {
+ ob_start();
</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->months_dropdown( $this->screen->post_type );
- $this->categories_dropdown( $this->screen->post_type );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->months_dropdown( $this->screen->post_type );
+ $this->categories_dropdown( $this->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">- /**
- * Fires before the Filter button on the Posts and Pages list tables.
- *
- * The Filter button allows sorting by date and/or category on the
- * Posts list table, and sorting by date on the Pages list table.
- *
- * @since 2.1.0
- * @since 4.4.0 The `$post_type` parameter was added.
- * @since 4.6.0 The `$which` parameter was added.
- *
- * @param string $post_type The post type slug.
- * @param string $which The location of the extra table nav markup:
- * 'top' or 'bottom' for WP_Posts_List_Table,
- * 'bar' for WP_Media_List_Table.
- */
- do_action( 'restrict_manage_posts', $this->screen->post_type, $which );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Fires before the Filter button on the Posts and Pages list tables.
+ *
+ * The Filter button allows sorting by date and/or category on the
+ * Posts list table, and sorting by date on the Pages list table.
+ *
+ * @since 2.1.0
+ * @since 4.4.0 The `$post_type` parameter was added.
+ * @since 4.6.0 The `$which` parameter was added.
+ *
+ * @param string $post_type The post type slug.
+ * @param string $which The location of the extra table nav markup:
+ * 'top' or 'bottom' for WP_Posts_List_Table,
+ * 'bar' for WP_Media_List_Table.
+ */
+ do_action( 'restrict_manage_posts', $this->screen->post_type, $which );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output = ob_get_clean();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output = ob_get_clean();
</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( $output ) ) {
- echo $output;
- submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
- }
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $output ) ) {
+ echo $output;
+ submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+ }
+ }
</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 ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_others_posts ) && $this->has_items() ) {
- submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
-}
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_others_posts ) && $this->has_items() ) {
+ submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
+ }
+ ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires immediately following the closing "actions" div in the tablenav for the posts
</span><span class="cx" style="display: block; padding: 0 10px"> * list table.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -850,11 +852,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function column_cb( $post ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'edit_post', $post->ID ) ) :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <label class="screen-reader-text" for="cb-select-<?php the_ID(); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Select %s' ), _draft_or_post_title() );
</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"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input id="cb-select-<?php the_ID(); ?>" type="checkbox" name="post[]" value="<?php the_ID(); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="locked-indicator">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -869,7 +871,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</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
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1219,11 +1221,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $classes .= ' 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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr id="post-<?php echo $post->ID; ?>" class="<?php echo implode( ' ', get_post_class( $classes, $post->ID ) ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->single_row_columns( $post ); ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['post'] = $global_post;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1417,7 +1419,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'author' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?>
</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"> <form method="get"><table style="display: none"><tbody id="inlineedit">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1428,28 +1430,28 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $bulk = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> while ( $bulk < 2 ) {
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> echo $inline_edit_classes . ' ';
</span><span class="cx" style="display: block; padding: 0 10px"> echo $bulk ? $bulk_edit_classes : $quick_edit_classes;
</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"> " style="display: none"><td colspan="<?php echo $this->get_column_count(); ?>" class="colspanchange">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <fieldset class="inline-edit-col-left">
</span><span class="cx" style="display: block; padding: 0 10px"> <legend class="inline-edit-legend"><?php echo $bulk ? __( 'Bulk Edit' ) : __( 'Quick Edit' ); ?></legend>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="inline-edit-col">
</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
</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 ) :
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( post_type_supports( $screen->post_type, 'title' ) ) :
+ if ( $bulk ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="bulk-title-div">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="bulk-titles"></div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php else : // $bulk ?>
</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><span class="cx" style="display: block; padding: 0 10px"> <label>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="title"><?php _e( 'Title' ); ?></span>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1464,15 +1466,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // $bulk
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // post_type_supports title
</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">
</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 ( ! $bulk ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <fieldset class="inline-edit-date">
</span><span class="cx" style="display: block; padding: 0 10px"> <legend><span class="title"><?php _e( 'Date' ); ?></span></legend>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php touch_time( 1, 1, 0, 1 ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><span class="cx" style="display: block; padding: 0 10px"> <br class="clear" />
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> endif; // $bulk
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( post_type_supports( $screen->post_type, 'author' ) ) :
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1531,16 +1533,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div></fieldset>
</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 ( count( $hierarchical_taxonomies ) && ! $bulk ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( count( $hierarchical_taxonomies ) && ! $bulk ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <fieldset class="inline-edit-col-center inline-edit-categories"><div class="inline-edit-col">
</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 foreach ( $hierarchical_taxonomies as $taxonomy ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php foreach ( $hierarchical_taxonomies as $taxonomy ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="title inline-edit-categories-label"><?php echo esc_html( $taxonomy->labels->name ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="<?php echo ( $taxonomy->name === 'category' ) ? 'post_category[]' : 'tax_input[' . esc_attr( $taxonomy->name ) . '][]'; ?>" value="0" />
</span><span class="cx" style="display: block; padding: 0 10px"> <ul class="cat-checklist <?php echo esc_attr( $taxonomy->name ); ?>-checklist">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php wp_terms_checklist( null, array( 'taxonomy' => $taxonomy->name ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_terms_checklist( null, array( 'taxonomy' => $taxonomy->name ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; //$hierarchical_taxonomies as $taxonomy ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1551,51 +1553,51 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <fieldset class="inline-edit-col-right"><div class="inline-edit-col">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- if ( post_type_supports( $screen->post_type, 'author' ) && $bulk ) {
- echo $authors_dropdown;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ 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">- if ( post_type_supports( $screen->post_type, 'page-attributes' ) ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( post_type_supports( $screen->post_type, 'page-attributes' ) ) :
</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 ) :
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $post_type_object->hierarchical ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <label>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="title"><?php _e( 'Parent' ); ?></span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?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">+ <?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',
+ );
</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'] = __( '— No Change —' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $bulk ) {
+ $dropdown_args['show_option_no_change'] = __( '— No Change —' );
+ }
</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">+ /**
+ * 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 );
</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 );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_dropdown_pages( $dropdown_args );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </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">-<?php
- endif; // hierarchical
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ endif; // hierarchical
</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">+ if ( ! $bulk ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <label>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="title"><?php _e( 'Order' ); ?></span>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1602,18 +1604,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="input-text-wrap"><input type="text" name="menu_order" class="inline-edit-menu-order-input" value="<?php echo $post->menu_order; ?>" /></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </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">- <?php
- endif; // !$bulk
</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"> endif; // page-attributes
</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">
</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 ) ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 0 < count( get_page_templates( null, $screen->post_type ) ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <label>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="title"><?php _e( 'Template' ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <select name="page_template">
</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 ( $bulk ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <option value="-1"><?php _e( '— No Change —' ); ?></option>
</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">+ <?php endif; // $bulk ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/meta-boxes.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $default_title = apply_filters( 'default_page_template_title', __( 'Default Template' ), 'quick-edit' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1624,31 +1626,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( count( $flat_taxonomies ) && ! $bulk ) : ?>
</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 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 foreach ( $flat_taxonomies as $taxonomy ) : ?>
+ <?php
+ if ( current_user_can( $taxonomy->cap->assign_terms ) ) :
+ $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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <label class="inline-edit-tags">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="title"><?php echo esc_html( $taxonomy->labels->name ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <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>
</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 endif; ?>
</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><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; //$flat_taxonomies as $taxonomy ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // count( $flat_taxonomies ) && !$bulk ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- if ( post_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">+ <?php
+ if ( post_type_supports( $screen->post_type, 'comments' ) || post_type_supports( $screen->post_type, 'trackbacks' ) ) :
+ if ( $bulk ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="inline-edit-group wp-clearfix">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
</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"> <label class="alignleft">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="title"><?php _e( 'Comments' ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <select name="comment_status">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1669,7 +1671,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span 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 else : // $bulk ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="inline-edit-group wp-clearfix">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1688,19 +1690,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // $bulk
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // post_type_supports comments or pings
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="inline-edit-group wp-clearfix">
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="inline-edit-status alignleft">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="title"><?php _e( 'Status' ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <select name="_status">
</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 ( $bulk ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <option value="-1"><?php _e( '— No Change —' ); ?></option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // $bulk ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $can_publish ) : // Contributors only get "Unpublished" and "Pending Review" ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="publish"><?php _e( 'Published' ); ?></option>
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="future"><?php _e( 'Scheduled' ); ?></option>
</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 ( $bulk ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <option value="private"><?php _e( 'Private' ); ?></option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // $bulk ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1709,9 +1711,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="cx" style="display: block; padding: 0 10px"> </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">- <?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">+ <?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">- <?php if ( $bulk ) : ?>
</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><span class="cx" style="display: block; padding: 0 10px"> <label class="alignright">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="title"><?php _e( 'Sticky' ); ?></span>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1735,69 +1737,69 @@
</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">
</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
</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">+ if ( $bulk && current_theme_supports( 'post-formats' ) && post_type_supports( $screen->post_type, 'post-formats' ) ) {
+ $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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <label class="alignleft">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="title"><?php _ex( 'Format', 'post format' ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <select name="post_format">
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="-1"><?php _e( '— No Change —' ); ?></option>
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="0"><?php echo get_post_format_string( 'standard' ); ?></option>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- if ( is_array( $post_formats[0] ) ) {
- foreach ( $post_formats[0] as $format ) {
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( is_array( $post_formats[0] ) ) {
+ foreach ( $post_formats[0] as $format ) {
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <option value="<?php echo esc_attr( $format ); ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></option>
</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
+ }
</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">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </select></label>
</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
</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">+ }
</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">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div></fieldset>
</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
- list( $columns ) = $this->get_column_info();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ list( $columns ) = $this->get_column_info();
</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">+ foreach ( $columns as $column_name => $column_display_name ) {
+ if ( isset( $core_columns[ $column_name ] ) ) {
+ 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">- if ( $bulk ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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">- /**
- * Fires once for each column in Bulk Edit mode.
- *
- * @since 2.7.0
- *
- * @param string $column_name Name of the column to edit.
- * @param WP_Post $post_type The post type slug.
- */
- do_action( 'bulk_edit_custom_box', $column_name, $screen->post_type );
- } else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Fires once for each column in Bulk Edit mode.
+ *
+ * @since 2.7.0
+ *
+ * @param string $column_name Name of the column to edit.
+ * @param WP_Post $post_type The post type slug.
+ */
+ do_action( 'bulk_edit_custom_box', $column_name, $screen->post_type );
+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Fires once for each column in Quick Edit mode.
- *
- * @since 2.7.0
- *
- * @param string $column_name Name of the column to edit.
- * @param string $post_type The post type slug, or current screen name if this is a taxonomy list table.
- * @param string taxonomy The taxonomy name, if any.
- */
- do_action( 'quick_edit_custom_box', $column_name, $screen->post_type, '' );
- }
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Fires once for each column in Quick Edit mode.
+ *
+ * @since 2.7.0
+ *
+ * @param string $column_name Name of the column to edit.
+ * @param string $post_type The post type slug, or current screen name if this is a taxonomy list table.
+ * @param string taxonomy The taxonomy name, if any.
+ */
+ do_action( 'quick_edit_custom_box', $column_name, $screen->post_type, '' );
+ }
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="submit inline-edit-save">
</span><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="button cancel alignleft"><?php _e( 'Cancel' ); ?></button>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1806,7 +1808,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="button button-primary save alignright"><?php _e( 'Update' ); ?></button>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="spinner"></span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> submit_button( __( 'Update' ), 'primary alignright', 'bulk_edit', false );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1822,11 +1824,11 @@
</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"> </td></tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- $bulk++;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tbody></table></form>
</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
</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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-wp-screen.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -806,7 +806,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_html( $tab['title'] ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> $class = '';
</span><span class="cx" style="display: block; padding: 0 10px"> endforeach;
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -837,7 +837,7 @@
</span><span class="cx" style="display: 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>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes = 'help-tab-content';
</span><span class="cx" style="display: block; padding: 0 10px"> endforeach;
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -890,10 +890,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="contextual-help-link-wrap" class="hide-if-no-js screen-meta-toggle">
</span><span class="cx" style="display: block; padding: 0 10px"> <button type="button" id="contextual-help-link" class="button show-settings" aria-controls="contextual-help-wrap" aria-expanded="false"><?php _e( 'Help' ); ?></button>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->show_screen_options() ) :
</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"> <div id="screen-options-link-wrap" class="hide-if-no-js screen-meta-toggle">
</span><span class="cx" style="display: block; padding: 0 10px"> <button type="button" id="show-settings-link" class="button show-settings" aria-controls="screen-options-wrap" aria-expanded="false"><?php _e( 'Screen Options' ); ?></button>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -968,7 +968,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function render_screen_options( $options = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $options = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $options, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $options,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wrap' => 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">@@ -1121,12 +1122,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="columns-prefs-<?php echo $i; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type='radio' name='screen_columns' value='<?php echo esc_attr( $i ); ?>'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php checked( $screen_layout_columns, $i ); ?> />
- <?php printf( _n( '%s column', '%s columns', $i ), number_format_i18n( $i ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php checked( $screen_layout_columns, $i ); ?> />
+ <?php printf( _n( '%s column', '%s columns', $i ), number_format_i18n( $i ) ); ?>
</ins><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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> endfor;
</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"> </fieldset>
</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">@@ -1235,7 +1236,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This needs a submit button
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'screen_options_show_submit', '__return_true' );
</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"> <fieldset class="metabox-prefs view-mode">
</span><span class="cx" style="display: block; padding: 0 10px"> <legend><?php _e( 'View Mode' ); ?></legend>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="list-view-mode">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1247,7 +1248,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Excerpt View' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</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
</ins><span class="cx" style="display: block; 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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -212,7 +212,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = $this->screen->taxonomy;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->callback_args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->callback_args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'page' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'number' => 20,
</span><span class="cx" style="display: block; padding: 0 10px"> 'search' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -385,7 +386,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> urlencode( wp_unslash( $uri ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> $edit_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">- $name = sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $name = sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> '<a class="row-title" href="%s" aria-label="%s">%s</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $edit_link ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: taxonomy term name */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -607,7 +608,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( $tax->cap->edit_terms ) ) {
</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">-?>
</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"> <form method="get"><table style="display: none"><tbody id="inlineedit">
</span><span class="cx" style="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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -619,7 +620,7 @@
</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() ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! global_terms_enabled() ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <label>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="title"><?php _e( 'Slug' ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="input-text-wrap"><input type="text" name="slug" class="ptitle" value="" /></span>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -626,7 +627,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div></fieldset>
</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
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $core_columns = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cb' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -638,17 +639,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</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><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">+ 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><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">+ ?>
</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"> <div class="inline-edit-save submit">
</span><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="cancel button alignleft"><?php _e( 'Cancel' ); ?></button>
</span><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="save button button-primary alignright"><?php echo $tax->labels->update_item; ?></button>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -663,6 +664,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </td></tr>
</span><span class="cx" style="display: block; padding: 0 10px"> </tbody></table></form>
</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
</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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,7 +190,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function display() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_field( 'fetch-list-' . get_class( $this ), '_ajax_fetch_list_nonce' );
</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"> <div class="tablenav top themes">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="alignleft actions">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</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"> public function display_rows() {
</span><span class="cx" style="display: block; padding: 0 10px"> $themes = $this->items;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $themes as $theme ) {
</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"> <div class="available-theme installable-theme">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $this->single_row( $theme );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> } // end foreach $theme_names
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,7 +270,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'tab' => 'theme-information',
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme' => $theme->slug,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), self_admin_url( 'theme-install.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ self_admin_url( 'theme-install.php' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,7 +280,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'install-theme',
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme' => $theme->slug,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), self_admin_url( 'update.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ self_admin_url( 'update.php' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $update_url = add_query_arg(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,7 +288,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'upgrade-theme',
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme' => $theme->slug,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), self_admin_url( 'update.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ self_admin_url( 'update.php' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $status = $this->_get_theme_status( $theme );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -346,10 +349,12 @@
</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"> <h3><?php echo $name; ?></h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="theme-author"><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="theme-author">
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: theme author */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'By %s' ), $author );
</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">+ ?>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="action-links">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -430,7 +435,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'install-theme',
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme' => $theme->slug,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), self_admin_url( 'update.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ self_admin_url( 'update.php' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $update_url = add_query_arg(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -437,7 +443,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'upgrade-theme',
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme' => $theme->slug,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), self_admin_url( 'update.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ self_admin_url( 'update.php' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $status = $this->_get_theme_status( $theme );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -472,12 +479,14 @@
</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"> }
</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"> <h3 class="theme-name"><?php echo $name; ?></h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="theme-by"><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="theme-by">
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: theme author */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'By %s' ), $author );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ </span>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( isset( $theme->screenshot_url ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <img class="theme-screenshot" src="<?php echo esc_url( $theme->screenshot_url ); ?>" alt="" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-wp-themes-list-table.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> public function display() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_field( 'fetch-list-' . get_class( $this ), '_ajax_fetch_list_nonce' );
</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"> <?php $this->tablenav( 'top' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="availablethemes">
</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"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->tablenav( 'bottom' ); ?>
</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
</ins><span class="cx" style="display: block; 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">@@ -250,7 +250,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> endforeach;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpuserslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-users-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-users-list-table.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/class-wp-users-list-table.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> protected function extra_tablenav( $which ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $id = 'bottom' === $which ? 'new_role2' : 'new_role';
</span><span class="cx" style="display: block; padding: 0 10px"> $button_id = 'bottom' === $which ? 'changeit2' : 'changeit';
</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"> <div class="alignleft actions">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( current_user_can( 'promote_users' ) && $this->has_items() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="screen-reader-text" for="<?php echo $id; ?>"><?php _e( 'Change role to…' ); ?></label>
</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"> <option value=""><?php _e( 'Change role to…' ); ?></option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_dropdown_roles(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> submit_button( __( 'Change' ), '', $button_id, false );
</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">@@ -286,9 +286,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'restrict_manage_users', $which );
</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"> </div>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires immediately following the closing "actions" div in the tablenav for the users
</span><span class="cx" style="display: block; padding: 0 10px"> * list table.
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/dashboard.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> $columns_css = " columns-$columns";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> <div id="dashboard-widgets" class="metabox-holder<?php echo $columns_css; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="postbox-container-1" class="postbox-container">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_meta_boxes( $screen->id, 'normal', '' ); ?>
</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"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
</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"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_dashboard_right_now() {
</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"> <div class="main">
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -388,11 +388,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = 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( $actions ) ) :
</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"> <div class="sub">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $actions; ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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">
</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"> echo implode( " |</li>\n", $actions ) . "</li>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</ul>';
</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"> <br class="clear" />
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="youhave"><?php echo $sentence; ?></p>
</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"> <?php submit_button( __( 'Search Sites' ), '', false, false, array( 'id' => 'submit_sites' ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires at the end of the 'Right Now' widget in the Network Admin dashboard.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</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"> $post_ID = (int) $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">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <form name="post" action="<?php echo esc_url( admin_url( 'post.php' ) ); ?>" method="post" id="quick-press" class="initial-form hide-if-no-js">
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> $actions_string .= "<span class='$action'>$sep$link</span>";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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">
</span><span class="cx" style="display: block; padding: 0 10px"> <li id="comment-<?php echo $comment->comment_ID; ?>" <?php comment_class( array( 'comment-item', wp_get_comment_status( $comment ) ), $comment ); ?>>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -702,28 +702,28 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="dashboard-comment-wrap has-row-actions">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="comment-meta">
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> // Comments might not have a post they relate to, e.g. programmatically created ones.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $comment_post_link ) {
- printf(
- /* translators: 1: comment author, 2: post link, 3: notification if the comment is pending */
- __( 'From %1$s on %2$s %3$s' ),
- '<cite class="comment-author">' . get_comment_author_link( $comment ) . '</cite>',
- $comment_post_link,
- '<span class="approve">' . __( '[Pending]' ) . '</span>'
- );
- } else {
- printf(
- /* translators: 1: comment author, 2: notification if the comment is pending */
- __( 'From %1$s %2$s' ),
- '<cite class="comment-author">' . get_comment_author_link( $comment ) . '</cite>',
- '<span class="approve">' . __( '[Pending]' ) . '</span>'
- );
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $comment_post_link ) {
+ printf(
+ /* translators: 1: comment author, 2: post link, 3: notification if the comment is pending */
+ __( 'From %1$s on %2$s %3$s' ),
+ '<cite class="comment-author">' . get_comment_author_link( $comment ) . '</cite>',
+ $comment_post_link,
+ '<span class="approve">' . __( '[Pending]' ) . '</span>'
+ );
+ } else {
+ printf(
+ /* translators: 1: comment author, 2: notification if the comment is pending */
+ __( 'From %1$s %2$s' ),
+ '<cite class="comment-author">' . get_comment_author_link( $comment ) . '</cite>',
+ '<span class="approve">' . __( '[Pending]' ) . '</span>'
+ );
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </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">- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> else :
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $comment->comment_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'pingback':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -736,28 +736,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $type = ucwords( $comment->comment_type );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $type = esc_html( $type );
</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"> <div class="dashboard-comment-wrap has-row-actions">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="comment-meta">
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> // Pingbacks, Trackbacks or custom comment types might not have a post they relate to, e.g. programmatically created ones.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $comment_post_link ) {
- printf(
- /* translators: 1: type of comment, 2: post link, 3: notification if the comment is pending */
- _x( '%1$s on %2$s %3$s', 'dashboard' ),
- "<strong>$type</strong>",
- $comment_post_link,
- '<span class="approve">' . __( '[Pending]' ) . '</span>'
- );
- } else {
- printf(
- /* translators: 1: type of comment, 2: notification if the comment is pending */
- _x( '%1$s %2$s', 'dashboard' ),
- "<strong>$type</strong>",
- '<span class="approve">' . __( '[Pending]' ) . '</span>'
- );
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $comment_post_link ) {
+ printf(
+ /* translators: 1: type of comment, 2: post link, 3: notification if the comment is pending */
+ _x( '%1$s on %2$s %3$s', 'dashboard' ),
+ "<strong>$type</strong>",
+ $comment_post_link,
+ '<span class="approve">' . __( '[Pending]' ) . '</span>'
+ );
+ } else {
+ printf(
+ /* translators: 1: type of comment, 2: notification if the comment is pending */
+ _x( '%1$s %2$s', 'dashboard' ),
+ "<strong>$type</strong>",
+ '<span class="approve">' . __( '[Pending]' ) . '</span>'
+ );
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="comment-author"><?php comment_author_link( $comment ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -768,7 +768,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['comment'] = 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">@@ -1049,7 +1049,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_scalar( $widget_control_id ) && $widget_control_id && isset( $wp_dashboard_control_callbacks[ $widget_control_id ] ) && is_callable( $wp_dashboard_control_callbacks[ $widget_control_id ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> call_user_func(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_dashboard_control_callbacks[ $widget_control_id ], '', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_dashboard_control_callbacks[ $widget_control_id ],
+ '',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => $widget_control_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => $wp_dashboard_control_callbacks[ $widget_control_id ],
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1760,7 +1762,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_theme_supports( 'widgets' ) && current_theme_supports( 'menus' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Manage <a href="%1$s">widgets</a> or <a href="%2$s">menus</a>' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- admin_url( 'widgets.php' ), admin_url( 'nav-menus.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ admin_url( 'widgets.php' ),
+ admin_url( 'nav-menus.php' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( current_theme_supports( 'widgets' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<a href="' . admin_url( 'widgets.php' ) . '">' . __( 'Manage widgets' ) . '</a>';
</span></span></pre></div>
<a id="trunksrcwpadminincludesexportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/export.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/export.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/export.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <!-- 7. WordPress will then import each of the posts, pages, comments, categories, etc. -->
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- contained in this file into your 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">-<?php the_generator( 'export' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php the_generator( 'export' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <rss version="2.0"
</span><span class="cx" style="display: block; padding: 0 10px"> xmlns:excerpt="http://wordpress.org/export/<?php echo WXR_VERSION; ?>/excerpt/"
</span><span class="cx" style="display: block; padding: 0 10px"> xmlns:content="http://purl.org/rss/1.0/modules/content/"
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -464,9 +464,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:base_site_url><?php echo wxr_site_url(); ?></wp:base_site_url>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:base_blog_url><?php bloginfo_rss( 'url' ); ?></wp:base_blog_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">-<?php wxr_authors_list( $post_ids ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wxr_authors_list( $post_ids ); ?>
</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 ( $cats as $c ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php foreach ( $cats as $c ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <wp:category>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:term_id><?php echo intval( $c->term_id ); ?></wp:term_id>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:category_nicename><?php echo wxr_cdata( $c->slug ); ?></wp:category_nicename>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -477,8 +477,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wxr_term_meta( $c );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </wp:category>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endforeach; ?>
-<?php foreach ( $tags as $t ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endforeach; ?>
+ <?php foreach ( $tags as $t ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <wp:tag>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:term_id><?php echo intval( $t->term_id ); ?></wp:term_id>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:tag_slug><?php echo wxr_cdata( $t->slug ); ?></wp:tag_slug>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -488,8 +488,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wxr_term_meta( $t );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </wp:tag>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endforeach; ?>
-<?php foreach ( $terms as $t ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endforeach; ?>
+ <?php foreach ( $terms as $t ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <wp:term>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:term_id><?php echo wxr_cdata( $t->term_id ); ?></wp:term_id>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:term_taxonomy><?php echo wxr_cdata( $t->taxonomy ); ?></wp:term_taxonomy>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -501,11 +501,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wxr_term_meta( $t );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </wp:term>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endforeach; ?>
-<?php
-if ( 'all' == $args['content'] ) {
- wxr_nav_menu_terms();}
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endforeach; ?>
+ <?php
+ if ( 'all' == $args['content'] ) {
+ wxr_nav_menu_terms();}
+ ?>
</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"> /** This action is documented in wp-includes/feed-rss2.php */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -512,32 +512,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'rss2_head' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-if ( $post_ids ) {
- /**
- * @global WP_Query $wp_query
- */
- global $wp_query;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( $post_ids ) {
+ /**
+ * @global WP_Query $wp_query
+ */
+ global $wp_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">- // Fake being in the loop.
- $wp_query->in_the_loop = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Fake being in the loop.
+ $wp_query->in_the_loop = 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">- // Fetch 20 posts at a time rather than loading the entire table into memory.
- while ( $next_posts = array_splice( $post_ids, 0, 20 ) ) {
- $where = 'WHERE ID IN (' . join( ',', $next_posts ) . ')';
- $posts = $wpdb->get_results( "SELECT * FROM {$wpdb->posts} $where" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Fetch 20 posts at a time rather than loading the entire table into memory.
+ while ( $next_posts = array_splice( $post_ids, 0, 20 ) ) {
+ $where = 'WHERE ID IN (' . join( ',', $next_posts ) . ')';
+ $posts = $wpdb->get_results( "SELECT * FROM {$wpdb->posts} $where" );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Begin Loop.
- foreach ( $posts as $post ) {
- setup_postdata( $post );
- $is_sticky = is_sticky( $post->ID ) ? 1 : 0;
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Begin Loop.
+ foreach ( $posts as $post ) {
+ setup_postdata( $post );
+ $is_sticky = is_sticky( $post->ID ) ? 1 : 0;
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <item>
</span><span class="cx" style="display: block; padding: 0 10px"> <title>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- /** This filter is documented in wp-includes/feed.php */
- echo apply_filters( 'the_title_rss', $post->post_title );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /** This filter is documented in wp-includes/feed.php */
+ echo apply_filters( 'the_title_rss', $post->post_title );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </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"> <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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -545,28 +545,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <guid isPermaLink="false"><?php the_guid(); ?></guid>
</span><span class="cx" style="display: block; padding: 0 10px"> <description></description>
</span><span class="cx" style="display: block; padding: 0 10px"> <content:encoded>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- /**
- * Filters the post content used for WXR exports.
- *
- * @since 2.5.0
- *
- * @param string $post_content Content of the current post.
- */
- echo wxr_cdata( apply_filters( 'the_content_export', $post->post_content ) );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Filters the post content used for WXR exports.
+ *
+ * @since 2.5.0
+ *
+ * @param string $post_content Content of the current post.
+ */
+ echo wxr_cdata( apply_filters( 'the_content_export', $post->post_content ) );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </content:encoded>
</span><span class="cx" style="display: block; padding: 0 10px"> <excerpt:encoded>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- /**
- * Filters the post excerpt used for WXR exports.
- *
- * @since 2.6.0
- *
- * @param string $post_excerpt Excerpt for the current post.
- */
- echo wxr_cdata( apply_filters( 'the_excerpt_export', $post->post_excerpt ) );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Filters the post excerpt used for WXR exports.
+ *
+ * @since 2.6.0
+ *
+ * @param string $post_excerpt Excerpt for the current post.
+ */
+ echo wxr_cdata( apply_filters( 'the_excerpt_export', $post->post_excerpt ) );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </excerpt:encoded>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:post_id><?php echo intval( $post->ID ); ?></wp:post_id>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:post_date><?php echo wxr_cdata( $post->post_date ); ?></wp:post_date>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -580,40 +580,40 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:post_type><?php echo wxr_cdata( $post->post_type ); ?></wp:post_type>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:post_password><?php echo wxr_cdata( $post->post_password ); ?></wp:post_password>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:is_sticky><?php echo intval( $is_sticky ); ?></wp:is_sticky>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $post->post_type == 'attachment' ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $post->post_type == 'attachment' ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <wp:attachment_url><?php echo wxr_cdata( wp_get_attachment_url( $post->ID ) ); ?></wp:attachment_url>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php wxr_post_taxonomy(); ?>
- <?php
- $postmeta = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE post_id = %d", $post->ID ) );
- foreach ( $postmeta as $meta ) :
- /**
- * Filters whether to selectively skip post meta used for WXR exports.
- *
- * Returning a truthy value to the filter will skip the current meta
- * object from being exported.
- *
- * @since 3.3.0
- *
- * @param bool $skip Whether to skip the current post meta. Default false.
- * @param string $meta_key Current meta key.
- * @param object $meta Current meta object.
- */
- if ( apply_filters( 'wxr_export_skip_postmeta', false, $meta->meta_key, $meta ) ) {
- continue;
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wxr_post_taxonomy(); ?>
+ <?php
+ $postmeta = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE post_id = %d", $post->ID ) );
+ foreach ( $postmeta as $meta ) :
+ /**
+ * Filters whether to selectively skip post meta used for WXR exports.
+ *
+ * Returning a truthy value to the filter will skip the current meta
+ * object from being exported.
+ *
+ * @since 3.3.0
+ *
+ * @param bool $skip Whether to skip the current post meta. Default false.
+ * @param string $meta_key Current meta key.
+ * @param object $meta Current meta object.
+ */
+ if ( apply_filters( 'wxr_export_skip_postmeta', false, $meta->meta_key, $meta ) ) {
+ continue;
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <wp:postmeta>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:meta_key><?php echo wxr_cdata( $meta->meta_key ); ?></wp:meta_key>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:meta_value><?php echo wxr_cdata( $meta->meta_value ); ?></wp:meta_value>
</span><span class="cx" style="display: block; padding: 0 10px"> </wp:postmeta>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-endforeach;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ 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">- $_comments = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved <> 'spam'", $post->ID ) );
- $comments = array_map( 'get_comment', $_comments );
- foreach ( $comments as $c ) :
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_comments = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved <> 'spam'", $post->ID ) );
+ $comments = array_map( 'get_comment', $_comments );
+ foreach ( $comments as $c ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <wp:comment>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:comment_id><?php echo intval( $c->comment_ID ); ?></wp:comment_id>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:comment_author><?php echo wxr_cdata( $c->comment_author ); ?></wp:comment_author>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -627,39 +627,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:comment_type><?php echo wxr_cdata( $c->comment_type ); ?></wp:comment_type>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:comment_parent><?php echo intval( $c->comment_parent ); ?></wp:comment_parent>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:comment_user_id><?php echo intval( $c->user_id ); ?></wp:comment_user_id>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
- $c_meta = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->commentmeta WHERE comment_id = %d", $c->comment_ID ) );
-foreach ( $c_meta as $meta ) :
- /**
- * Filters whether to selectively skip comment meta used for WXR exports.
- *
- * Returning a truthy value to the filter will skip the current meta
- * object from being exported.
- *
- * @since 4.0.0
- *
- * @param bool $skip Whether to skip the current comment meta. Default false.
- * @param string $meta_key Current meta key.
- * @param object $meta Current meta object.
- */
- if ( apply_filters( 'wxr_export_skip_commentmeta', false, $meta->meta_key, $meta ) ) {
- continue;
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $c_meta = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->commentmeta WHERE comment_id = %d", $c->comment_ID ) );
+ foreach ( $c_meta as $meta ) :
+ /**
+ * Filters whether to selectively skip comment meta used for WXR exports.
+ *
+ * Returning a truthy value to the filter will skip the current meta
+ * object from being exported.
+ *
+ * @since 4.0.0
+ *
+ * @param bool $skip Whether to skip the current comment meta. Default false.
+ * @param string $meta_key Current meta key.
+ * @param object $meta Current meta object.
+ */
+ if ( apply_filters( 'wxr_export_skip_commentmeta', false, $meta->meta_key, $meta ) ) {
+ continue;
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <wp:commentmeta>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:meta_key><?php echo wxr_cdata( $meta->meta_key ); ?></wp:meta_key>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:meta_value><?php echo wxr_cdata( $meta->meta_value ); ?></wp:meta_value>
</span><span class="cx" style="display: block; padding: 0 10px"> </wp:commentmeta>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endforeach; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endforeach; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </wp:comment>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endforeach; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endforeach; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </item>
</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
+ }
</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">-}
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </channel>
</span><span class="cx" style="display: block; padding: 0 10px"> </rss>
</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
</ins><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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/file.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -890,11 +890,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $context The type of upload action. Values include 'upload' or 'sideload'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp_handle_upload', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp_handle_upload',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'file' => $new_file,
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => $url,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => $type,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'wp_handle_sideload' === $action ? 'sideload' : 'upload'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'wp_handle_sideload' === $action ? 'sideload' : 'upload'
</ins><span class="cx" style="display: block; 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">@@ -982,7 +984,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"> $response = wp_safe_remote_get(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'timeout' => $timeout,
</span><span class="cx" style="display: block; padding: 0 10px"> 'stream' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'filename' => $tmpfname,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1679,7 +1682,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"> $credentials = get_option(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'ftp_credentials', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'ftp_credentials',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hostname' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'username' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1786,35 +1790,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $types = apply_filters( 'fs_ftp_connection_types', $types, $credentials, $type, $error, $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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <form action="<?php echo esc_url( $form_post ); ?>" method="post">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="request-filesystem-credentials-form" class="request-filesystem-credentials-form">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-// Print a H1 heading in the FTP credentials modal dialog, default is a H2.
-$heading_tag = 'h2';
-if ( 'plugins.php' === $pagenow || 'plugin-install.php' === $pagenow ) {
- $heading_tag = 'h1';
-}
-echo "<$heading_tag id='request-filesystem-credentials-title'>" . __( 'Connection Information' ) . "</$heading_tag>";
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ // Print a H1 heading in the FTP credentials modal dialog, default is a H2.
+ $heading_tag = 'h2';
+ if ( 'plugins.php' === $pagenow || 'plugin-install.php' === $pagenow ) {
+ $heading_tag = 'h1';
+ }
+ echo "<$heading_tag id='request-filesystem-credentials-title'>" . __( 'Connection Information' ) . "</$heading_tag>";
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p id="request-filesystem-credentials-desc">
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> $label_user = __( 'Username' );
</span><span class="cx" style="display: block; padding: 0 10px"> $label_pass = __( 'Password' );
</span><span class="cx" style="display: block; padding: 0 10px"> _e( 'To perform the requested action, WordPress needs to access your web server.' );
</span><span class="cx" style="display: block; padding: 0 10px"> echo ' ';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ( isset( $types['ftp'] ) || isset( $types['ftps'] ) ) ) {
- if ( isset( $types['ssh'] ) ) {
- _e( 'Please enter your FTP or SSH credentials to proceed.' );
- $label_user = __( 'FTP/SSH Username' );
- $label_pass = __( 'FTP/SSH Password' );
- } else {
- _e( 'Please enter your FTP credentials to proceed.' );
- $label_user = __( 'FTP Username' );
- $label_pass = __( 'FTP Password' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( isset( $types['ftp'] ) || isset( $types['ftps'] ) ) ) {
+ if ( isset( $types['ssh'] ) ) {
+ _e( 'Please enter your FTP or SSH credentials to proceed.' );
+ $label_user = __( 'FTP/SSH Username' );
+ $label_pass = __( 'FTP/SSH Password' );
+ } else {
+ _e( 'Please enter your FTP credentials to proceed.' );
+ $label_user = __( 'FTP Username' );
+ $label_pass = __( 'FTP Password' );
+ }
+ echo ' ';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo ' ';
-}
</del><span class="cx" style="display: block; padding: 0 10px"> _e( 'If you do not remember your credentials, you should contact your web host.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $hostname_value = esc_attr( $hostname );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1826,7 +1830,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'FTP_PASS' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $password_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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="hostname">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="field-title"><?php _e( 'Hostname' ); ?></span>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1846,31 +1850,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'FTP_PASS' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _e( 'This password will not be stored on the server.' );}
</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"> </em>
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <fieldset>
</span><span class="cx" style="display: block; padding: 0 10px"> <legend><?php _e( 'Connection Type' ); ?></legend>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> $disabled = disabled( ( defined( 'FTP_SSL' ) && FTP_SSL ) || ( defined( 'FTP_SSH' ) && FTP_SSH ), true, false );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-foreach ( $types as $name => $text ) :
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $types as $name => $text ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <label for="<?php echo esc_attr( $name ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="radio" name="connection_type" id="<?php echo esc_attr( $name ); ?>" value="<?php echo esc_attr( $name ); ?>" <?php checked( $name, $connection_type ); ?> <?php echo $disabled; ?> />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $text; ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> endforeach;
</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"> </fieldset>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-if ( isset( $types['ssh'] ) ) {
- $hidden_class = '';
- if ( 'ssh' != $connection_type || empty( $connection_type ) ) {
- $hidden_class = ' class="hidden"';
- }
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( isset( $types['ssh'] ) ) {
+ $hidden_class = '';
+ if ( 'ssh' != $connection_type || empty( $connection_type ) ) {
+ $hidden_class = ' class="hidden"';
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <fieldset id="ssh-keys"<?php echo $hidden_class; ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <legend><?php _e( 'Authentication Keys' ); ?></legend>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="public_key">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1883,15 +1887,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <p id="auth-keys-desc"><?php _e( 'Enter the location on the server where the public and private keys are located. If a passphrase is needed, enter that in the password field above.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</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
+ }
</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 ( (array) $extra_fields as $field ) {
- if ( isset( $submitted_form[ $field ] ) ) {
- echo '<input type="hidden" name="' . esc_attr( $field ) . '" value="' . esc_attr( $submitted_form[ $field ] ) . '" />';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $extra_fields as $field ) {
+ if ( isset( $submitted_form[ $field ] ) ) {
+ echo '<input type="hidden" name="' . esc_attr( $field ) . '" value="' . esc_attr( $submitted_form[ $field ] ) . '" />';
+ }
</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">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="request-filesystem-credentials-action-buttons">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nonce_field( 'filesystem-credentials', '_fs_nonce', false, true ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <button class="button cancel-button" data-js-action="close" type="button"><?php _e( 'Cancel' ); ?></button>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1899,7 +1903,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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">@@ -1953,11 +1957,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_privacy_generate_personal_data_export_group_html( $group_data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_tags = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'a' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'a' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'href' => array(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'target' => array()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'target' => array(),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'br' => array()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'br' => array(),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_protocols = array( 'http', 'https' );
</span><span class="cx" style="display: block; padding: 0 10px"> $group_html = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2041,7 +2045,7 @@
</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 class="cx" style="display: block; padding: 0 10px"> $html_report_pathname = wp_normalize_path( $exports_dir . $html_report_filename );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $file = fopen( $html_report_pathname, 'w' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $file = fopen( $html_report_pathname, 'w' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false === $file ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( __( 'Unable to open export file (HTML report) for writing.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2060,15 +2064,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> fwrite( $file, "<head>\n" );
</span><span class="cx" style="display: block; padding: 0 10px"> fwrite( $file, "<meta http-equiv='Content-Type' content='text/html; charset=UTF-8' />\n" );
</span><span class="cx" style="display: block; padding: 0 10px"> fwrite( $file, "<style type='text/css'>" );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fwrite( $file, "body { color: black; font-family: Arial, sans-serif; font-size: 11pt; margin: 15px auto; width: 860px; }" );
- fwrite( $file, "table { background: #f0f0f0; border: 1px solid #ddd; margin-bottom: 20px; width: 100%; }" );
- fwrite( $file, "th { padding: 5px; text-align: left; width: 20%; }" );
- fwrite( $file, "td { padding: 5px; }" );
- fwrite( $file, "tr:nth-child(odd) { background-color: #fafafa; }" );
- fwrite( $file, "</style>" );
- fwrite( $file, "<title>" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fwrite( $file, 'body { color: black; font-family: Arial, sans-serif; font-size: 11pt; margin: 15px auto; width: 860px; }' );
+ fwrite( $file, 'table { background: #f0f0f0; border: 1px solid #ddd; margin-bottom: 20px; width: 100%; }' );
+ fwrite( $file, 'th { padding: 5px; text-align: left; width: 20%; }' );
+ fwrite( $file, 'td { padding: 5px; }' );
+ fwrite( $file, 'tr:nth-child(odd) { background-color: #fafafa; }' );
+ fwrite( $file, '</style>' );
+ fwrite( $file, '<title>' );
</ins><span class="cx" style="display: block; padding: 0 10px"> fwrite( $file, esc_html( $title ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fwrite( $file, "</title>" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fwrite( $file, '</title>' );
</ins><span class="cx" style="display: block; padding: 0 10px"> fwrite( $file, "</head>\n" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Body.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2075,7 +2079,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> fwrite( $file, "<body>\n" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Heading.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fwrite( $file, "<h1>" . esc_html__( 'Personal Data Export' ) . "</h1>" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fwrite( $file, '<h1>' . esc_html__( 'Personal Data Export' ) . '</h1>' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // And now, all the Groups.
</span><span class="cx" style="display: block; padding: 0 10px"> $groups = get_post_meta( $request_id, '_export_data_grouped', true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2197,9 +2201,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expiration = apply_filters( 'wp_privacy_export_expiration', 3 * DAY_IN_SECONDS );
</span><span class="cx" style="display: block; padding: 0 10px"> $expiration_date = date_i18n( get_option( 'date_format' ), time() + $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">-/* translators: Do not translate EXPIRATION, LINK, SITENAME, SITEURL: those are placeholders. */
-$email_text = __(
-'Howdy,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Do not translate EXPIRATION, LINK, SITENAME, SITEURL: those are placeholders. */
+ $email_text = __(
+ 'Howdy,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> Your request for an export of personal data has been completed. You may
</span><span class="cx" style="display: block; padding: 0 10px"> download your personal data by clicking on the link below. For privacy
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2211,7 +2215,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> Regards,
</span><span class="cx" style="display: block; padding: 0 10px"> All at ###SITENAME###
</span><span class="cx" style="display: block; padding: 0 10px"> ###SITEURL###'
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the text of the email sent with a personal data export file.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2229,10 +2233,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $content = apply_filters( 'wp_privacy_personal_data_email_content', $email_text, $request_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">- $email_address = $request->email;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $email_address = $request->email;
</ins><span class="cx" style="display: block; padding: 0 10px"> $export_file_url = get_post_meta( $request_id, '_export_file_url', true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $site_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
- $site_url = home_url();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+ $site_url = home_url();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###EXPIRATION###', $expiration_date, $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###LINK###', esc_url_raw( $export_file_url ), $content );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2313,9 +2317,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If we are not yet on the last page of the last exporter, return now.
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/ajax-actions.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $exporters = apply_filters( 'wp_privacy_personal_data_exporters', array() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $exporters = apply_filters( 'wp_privacy_personal_data_exporters', array() );
</ins><span class="cx" style="display: block; padding: 0 10px"> $is_last_exporter = $exporter_index === count( $exporters );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $exporter_done = $response['done'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $exporter_done = $response['done'];
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $is_last_exporter || ! $exporter_done ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $response;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2339,8 +2343,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $groups[ $group_id ]['items'][ $item_id ] = 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">- $old_item_data = $groups[ $group_id ]['items'][ $item_id ];
- $merged_item_data = array_merge( $export_datum['data'], $old_item_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $old_item_data = $groups[ $group_id ]['items'][ $item_id ];
+ $merged_item_data = array_merge( $export_datum['data'], $old_item_data );
</ins><span class="cx" style="display: block; padding: 0 10px"> $groups[ $group_id ]['items'][ $item_id ] = $merged_item_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="trunksrcwpadminincludesimageeditphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/image-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/image-edit.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/image-edit.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( $can_restore ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $can_restore ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="imgedit-group">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="imgedit-group-top">
</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"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php } ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php } ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="imgedit-group">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="imgedit-group-top">
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $thumb && $sub_sizes ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $thumb_img = wp_constrain_dimensions( $thumb['width'], $thumb['height'], 160, 120 );
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="imgedit-group imgedit-applyto">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="imgedit-group-top">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -203,13 +203,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"> $note_no_rotate = '';
</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"> <button type="button" class="imgedit-rleft button" onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)"><span class="screen-reader-text"><?php esc_html_e( 'Rotate counter-clockwise' ); ?></span></button>
</span><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="imgedit-rright button" onclick="imageEdit.rotate(-90, <?php echo "$post_id, '$nonce'"; ?>, this)"><span class="screen-reader-text"><?php esc_html_e( 'Rotate clockwise' ); ?></span></button>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $note_no_rotate = '<p class="note-no-rotate"><em>' . __( 'Image rotation is not supported by your web host.' ) . '</em></p>';
</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"> <button type="button" class="imgedit-rleft button disabled" disabled></button>
</span><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="imgedit-rright button disabled" disabled></button>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</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"> <div class="imgedit-wait" id="imgedit-wait-<?php echo $post_id; ?>"></div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="hidden" id="imgedit-leaving-<?php echo $post_id; ?>"><?php _e( "There are unsaved changes that will be lost. 'OK' to continue, 'Cancel' to return to the Image Editor." ); ?></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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/image.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -437,7 +437,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $exif = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $exif = 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"> * Filters the image types to check for exif data.
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/import.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,7 +141,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'locale' => $locale,
</span><span class="cx" style="display: block; padding: 0 10px"> 'version' => $wp_version,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'http://api.wordpress.org/core/importers/1.1/'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'http://api.wordpress.org/core/importers/1.1/'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/media.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/media.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,12 +263,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $html
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function media_send_to_editor( $html ) {
</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"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> var win = window.dialogArguments || opener || parent || top;
</span><span class="cx" style="display: block; padding: 0 10px"> win.send_to_editor( <?php echo wp_json_encode( $html ); ?> );
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</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
</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">@@ -368,7 +368,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= ' ' . sprintf( __( 'Genre: %s.' ), $meta['genre'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> } elseif ( 0 === strpos( $type, 'image/' ) && $image_meta = wp_read_image_metadata( $file ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $title = $image_meta['title'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -388,7 +388,8 @@
</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="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => $excerpt,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $post_data
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $post_data
</ins><span class="cx" style="display: 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 should never be set as it would then overwrite an existing attachment.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -458,7 +459,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $post_id,
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $post_data
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $post_data
</ins><span class="cx" style="display: 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 should never be set as it would then overwrite an existing attachment.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -484,24 +486,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_iframe( $content_func /* ... */ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _wp_admin_html_begin();
</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"> <title><?php bloginfo( 'name' ); ?> › <?php _e( 'Uploads' ); ?> — <?php _e( 'WordPress' ); ?></title>
</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
</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_enqueue_style( 'colors' );
-// Check callback name for 'media'
-if ( ( is_array( $content_func ) && ! empty( $content_func[1] ) && 0 === strpos( (string) $content_func[1], 'media' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_enqueue_style( 'colors' );
+ // Check callback name for 'media'
+ if ( ( is_array( $content_func ) && ! empty( $content_func[1] ) && 0 === strpos( (string) $content_func[1], 'media' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> || ( ! is_array( $content_func ) && 0 === strpos( $content_func, 'media' ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_enqueue_style( 'deprecated-media' );
-}
-wp_enqueue_style( 'ie' );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_enqueue_style( 'deprecated-media' );
+ }
+ wp_enqueue_style( 'ie' );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
</span><span class="cx" style="display: block; padding: 0 10px"> var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>', pagenow = 'media-upload-popup', adminpage = 'media-upload-popup',
</span><span class="cx" style="display: block; padding: 0 10px"> isRtl = <?php echo (int) is_rtl(); ?>;
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-admin/admin-header.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'admin_enqueue_scripts', 'media-upload-popup' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -536,32 +538,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-admin/admin-header.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'admin_head' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( is_string( $content_func ) ) {
- /**
- * Fires in the admin header for each specific form tab in the legacy
- * (pre-3.5.0) media upload popup.
- *
- * The dynamic portion of the hook, `$content_func`, refers to the form
- * callback for the media upload type. Possible values include
- * 'media_upload_type_form', 'media_upload_type_url_form', and
- * 'media_upload_library_form'.
- *
- * @since 2.5.0
- */
- do_action( "admin_head_{$content_func}" );
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_string( $content_func ) ) {
+ /**
+ * Fires in the admin header for each specific form tab in the legacy
+ * (pre-3.5.0) media upload popup.
+ *
+ * The dynamic portion of the hook, `$content_func`, refers to the form
+ * callback for the media upload type. Possible values include
+ * 'media_upload_type_form', 'media_upload_type_url_form', and
+ * 'media_upload_library_form'.
+ *
+ * @since 2.5.0
+ */
+ do_action( "admin_head_{$content_func}" );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$body_id_attr = '';
-if ( isset( $GLOBALS['body_id'] ) ) {
- $body_id_attr = ' id="' . $GLOBALS['body_id'] . '"';
-}
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $body_id_attr = '';
+ if ( isset( $GLOBALS['body_id'] ) ) {
+ $body_id_attr = ' id="' . $GLOBALS['body_id'] . '"';
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </head>
</span><span class="cx" style="display: block; padding: 0 10px"> <body<?php echo $body_id_attr; ?> class="wp-core-ui no-js">
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> document.body.className = document.body.className.replace('no-js', 'js');
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = func_get_args();
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array_slice( $args, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> call_user_func_array( $content_func, $args );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -568,11 +570,11 @@
</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/admin-footer.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'admin_print_footer_scripts' );
</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"> <script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
</span><span class="cx" style="display: block; padding: 0 10px"> </body>
</span><span class="cx" style="display: block; padding: 0 10px"> </html>
</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
</ins><span class="cx" style="display: block; 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">@@ -754,7 +756,7 @@
</span><span class="cx" style="display: 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['insert-gallery'] ) || isset( $_POST['update-gallery'] ) ) {
</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"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> var win = window.dialogArguments || opener || parent || top;
</span><span class="cx" style="display: block; padding: 0 10px"> win.tb_remove();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1069,7 +1071,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * include 'Thumbnail', 'Medium', 'Large', 'Full Size'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $size_names = apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image_size_names_choose', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image_size_names_choose',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail' => __( 'Thumbnail' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'medium' => __( 'Medium' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'large' => __( 'Large' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1781,9 +1784,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $form_fields = apply_filters( 'attachment_fields_to_edit', $form_fields, $post );
</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">- $form_fields['image-size'], $form_fields['align'], $form_fields['image_alt'],
- $form_fields['post_title'], $form_fields['post_excerpt'], $form_fields['post_content'],
- $form_fields['url'], $form_fields['menu_order'], $form_fields['image_url']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $form_fields['image-size'],
+ $form_fields['align'],
+ $form_fields['image_alt'],
+ $form_fields['post_title'],
+ $form_fields['post_excerpt'],
+ $form_fields['post_content'],
+ $form_fields['url'],
+ $form_fields['menu_order'],
+ $form_fields['image_url']
</ins><span class="cx" style="display: 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/media.php */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1943,123 +1952,123 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $max_upload_size ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $max_upload_size = 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">-?>
</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"> <div id="media-upload-notice">
</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
</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 ( isset( $errors['upload_notice'] ) ) {
- echo $errors['upload_notice'];
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $errors['upload_notice'] ) ) {
+ echo $errors['upload_notice'];
+ }
</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">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="media-upload-error">
</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
</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 ( isset( $errors['upload_error'] ) && is_wp_error( $errors['upload_error'] ) ) {
- echo $errors['upload_error']->get_error_message();
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $errors['upload_error'] ) && is_wp_error( $errors['upload_error'] ) ) {
+ echo $errors['upload_error']->get_error_message();
+ }
</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">+ ?>
</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 ( is_multisite() && ! is_upload_space_available() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( is_multisite() && ! is_upload_space_available() ) {
+ /**
+ * Fires when an upload will exceed the defined upload space quota for a network site.
+ *
+ * @since 3.5.0
+ */
+ do_action( 'upload_ui_over_quota' );
+ return;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Fires when an upload will exceed the defined upload space quota for a network site.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires just before the legacy (pre-3.5.0) upload interface is loaded.
</ins><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.5.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"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( 'upload_ui_over_quota' );
- return;
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action( 'pre-upload-ui' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**
- * Fires just before the legacy (pre-3.5.0) upload interface is loaded.
- *
- * @since 2.6.0
- */
-do_action( 'pre-upload-ui' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_params = array(
+ 'post_id' => $post_id,
+ '_wpnonce' => wp_create_nonce( 'media-form' ),
+ 'type' => $_type,
+ 'tab' => $_tab,
+ 'short' => '1',
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$post_params = array(
- 'post_id' => $post_id,
- '_wpnonce' => wp_create_nonce( 'media-form' ),
- 'type' => $_type,
- 'tab' => $_tab,
- 'short' => '1',
-);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Filters the media upload post parameters.
+ *
+ * @since 3.1.0 As 'swfupload_post_params'
+ * @since 3.3.0
+ *
+ * @param array $post_params An array of media upload parameters used by Plupload.
+ */
+ $post_params = apply_filters( 'upload_post_params', $post_params );
</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 media upload post parameters.
- *
- * @since 3.1.0 As 'swfupload_post_params'
- * @since 3.3.0
- *
- * @param array $post_params An array of media upload parameters used by Plupload.
- */
-$post_params = apply_filters( 'upload_post_params', $post_params );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Since 4.9 the `runtimes` setting is hardcoded in our version of Plupload to `html5,html4`,
+ * and the `flash_swf_url` and `silverlight_xap_url` are not used.
+ */
+ $plupload_init = array(
+ 'browse_button' => 'plupload-browse-button',
+ 'container' => 'plupload-upload-ui',
+ 'drop_element' => 'drag-drop-area',
+ 'file_data_name' => 'async-upload',
+ 'url' => $upload_action_url,
+ 'filters' => array(
+ 'max_file_size' => $max_upload_size . 'b',
+ ),
+ 'multipart_params' => $post_params,
+ );
</ins><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 the `runtimes` setting is hardcoded in our version of Plupload to `html5,html4`,
- * and the `flash_swf_url` and `silverlight_xap_url` are not used.
- */
-$plupload_init = array(
- 'browse_button' => 'plupload-browse-button',
- 'container' => 'plupload-upload-ui',
- 'drop_element' => 'drag-drop-area',
- 'file_data_name' => 'async-upload',
- 'url' => $upload_action_url,
- 'filters' => array(
- 'max_file_size' => $max_upload_size . 'b',
- ),
- 'multipart_params' => $post_params,
-);
-
-// Currently only iOS Safari supports multiple files uploading but iOS 7.x has a bug that prevents uploading of videos
-// when enabled. See #29602.
-if ( wp_is_mobile() && strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false &&
</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.
+ if ( wp_is_mobile() && strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false &&
</ins><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $plupload_init['multi_selection'] = false;
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $plupload_init['multi_selection'] = false;
+ }
</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 default Plupload settings.
- *
- * @since 3.3.0
- *
- * @param array $plupload_init An array of default settings used by Plupload.
- */
-$plupload_init = apply_filters( 'plupload_init', $plupload_init );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Filters the default Plupload settings.
+ *
+ * @since 3.3.0
+ *
+ * @param array $plupload_init An array of default settings used by Plupload.
+ */
+ $plupload_init = apply_filters( 'plupload_init', $plupload_init );
</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">+ ?>
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-// Verify size is an int. If not return default value.
-$large_size_h = absint( get_option( 'large_size_h' ) );
-if ( ! $large_size_h ) {
- $large_size_h = 1024;
-}
-$large_size_w = absint( get_option( 'large_size_w' ) );
-if ( ! $large_size_w ) {
- $large_size_w = 1024;
-}
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ // Verify size is an int. If not return default value.
+ $large_size_h = absint( get_option( 'large_size_h' ) );
+ if ( ! $large_size_h ) {
+ $large_size_h = 1024;
+ }
+ $large_size_w = absint( get_option( 'large_size_w' ) );
+ if ( ! $large_size_w ) {
+ $large_size_w = 1024;
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> var resize_height = <?php echo $large_size_h; ?>, resize_width = <?php echo $large_size_w; ?>,
</span><span class="cx" style="display: block; padding: 0 10px"> wpUploaderInit = <?php echo wp_json_encode( $plupload_init ); ?>;
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="plupload-upload-ui" class="hide-if-no-js">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Fires before the upload interface loads.
- *
- * @since 2.6.0 As 'pre-flash-upload-ui'
- * @since 3.3.0
- */
-do_action( 'pre-plupload-upload-ui' );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Fires before the upload interface loads.
+ *
+ * @since 2.6.0 As 'pre-flash-upload-ui'
+ * @since 3.3.0
+ */
+ do_action( 'pre-plupload-upload-ui' );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="drag-drop-area">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="drag-drop-inside">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="drag-drop-info"><?php _e( 'Drop files here' ); ?></p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2067,15 +2076,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="drag-drop-buttons"><input id="plupload-browse-button" type="button" value="<?php esc_attr_e( 'Select Files' ); ?>" class="button" /></p>
</span><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">-<?php
-/**
- * Fires after the upload interface loads.
- *
- * @since 2.6.0 As 'post-flash-upload-ui'
- * @since 3.3.0
- */
-do_action( 'post-plupload-upload-ui' );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Fires after the upload interface loads.
+ *
+ * @since 2.6.0 As 'post-flash-upload-ui'
+ * @since 3.3.0
+ */
+ do_action( 'post-plupload-upload-ui' );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="html-upload-ui" class="hide-if-js">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2094,18 +2103,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="#" onclick="try{top.tb_remove();}catch(e){}; return false;"><?php _e( 'Cancel' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="clear"></div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Fires after the upload button in the media upload interface.
- *
- * @since 2.6.0
- */
-do_action( 'post-html-upload-ui' );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Fires after the upload button in the media upload interface.
+ *
+ * @since 2.6.0
+ */
+ do_action( 'post-html-upload-ui' );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="max-upload-size"><?php printf( __( 'Maximum upload file size: %s.' ), esc_html( size_format( $max_upload_size ) ) ); ?></p>
</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
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires on the post upload UI screen.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2148,16 +2157,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_user_setting( 'uploader' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $form_class .= ' html-uploader';
</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">
</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="<?php echo $type; ?>-form">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php submit_button( '', 'hidden', 'save', false ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( '', 'hidden', 'save', false ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php wp_nonce_field( 'media-form' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( 'media-form' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3 class="media-title"><?php _e( 'Add media files from your computer' ); ?></h3>
</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 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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2169,25 +2178,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="media-items">
</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
</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 ( $id ) {
- if ( ! is_wp_error( $id ) ) {
- add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 );
- echo get_media_items( $id, $errors );
- } else {
- echo '<div id="media-upload-error">' . esc_html( $id->get_error_message() ) . '</div></div>';
- exit;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $id ) {
+ if ( ! is_wp_error( $id ) ) {
+ add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 );
+ echo get_media_items( $id, $errors );
+ } else {
+ echo '<div id="media-upload-error">' . esc_html( $id->get_error_message() ) . '</div></div>';
+ exit;
+ }
</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">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="savebutton ml-submit">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php submit_button( __( 'Save all changes' ), '', 'save', false ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( __( 'Save all changes' ), '', 'save', false ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -2216,11 +2225,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_user_setting( 'uploader' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $form_class .= ' html-uploader';
</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">
</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="<?php echo $type; ?>-form">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php wp_nonce_field( 'media-form' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( 'media-form' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3 class="media-title"><?php _e( 'Insert media from another website' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2240,10 +2249,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( f.alt.value )
</span><span class="cx" style="display: block; padding: 0 10px"> alt = f.alt.value.replace(/'/g, ''').replace(/"/g, '"').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">-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/media.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! apply_filters( 'disable_captions', '' ) ) {
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! apply_filters( 'disable_captions', '' ) ) {
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( f.caption.value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> caption = f.caption.value.replace(/\r\n|\r/g, '\n');
</span><span class="cx" style="display: block; padding: 0 10px"> caption = caption.replace(/<[a-zA-Z0-9]+( [^<>]+)?>/g, function(a){
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2252,7 +2261,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><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><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 } ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> cls = caption ? '' : ' class="'+t.align+'"';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2318,20 +2327,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="media-items">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="media-item media-blank">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Filters the insert media from URL form HTML.
- *
- * @since 3.3.0
- *
- * @param string $form_html The insert from URL form HTML.
- */
-echo apply_filters( 'type_url_form_media', wp_media_insert_url_form( $type ) );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Filters the insert media from URL form HTML.
+ *
+ * @since 3.3.0
+ *
+ * @param string $form_html The insert from URL form HTML.
+ */
+ echo apply_filters( 'type_url_form_media', wp_media_insert_url_form( $type ) );
+ ?>
</ins><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"> </form>
</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
</ins><span class="cx" style="display: block; 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">@@ -2360,7 +2369,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_user_setting( 'uploader' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $form_class .= ' html-uploader';
</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">
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2373,18 +2382,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="sort-buttons" class="hide-if-no-js">
</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 _e( 'All Tabs:' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e( 'All Tabs:' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a href="#" id="showall"><?php _e( 'Show' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="#" id="hideall" style="display:none;"><?php _e( 'Hide' ); ?></a>
</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 _e( 'Sort Order:' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e( 'Sort Order:' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a href="#" id="asc"><?php _e( 'Ascending' ); ?></a> |
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="#" id="desc"><?php _e( 'Descending' ); ?></a> |
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="#" id="clear"><?php _ex( 'Clear', 'verb' ); ?></a>
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php wp_nonce_field( 'media-form' ); ?>
-<?php //media_upload_form( $errors ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( 'media-form' ); ?>
+ <?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">@@ -2393,19 +2402,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </tr></thead>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="media-items">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 ); ?>
-<?php echo get_media_items( $post_id, $errors ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 ); ?>
+ <?php echo get_media_items( $post_id, $errors ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="ml-submit">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-submit_button(
- __( 'Save all changes' ), 'savebutton', 'save', false, array(
- 'id' => 'save-all',
- 'style' => 'display: none;',
- )
-);
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ submit_button(
+ __( 'Save all changes' ),
+ 'savebutton',
+ 'save',
+ false,
+ array(
+ 'id' => 'save-all',
+ 'style' => 'display: none;',
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="type" value="<?php echo esc_attr( $GLOBALS['type'] ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="tab" value="<?php echo esc_attr( $GLOBALS['tab'] ); ?>" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2488,7 +2501,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -2534,7 +2547,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query( $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">-?>
</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"> <form id="filter" method="get">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="type" value="<?php echo esc_attr( $type ); ?>" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2550,127 +2563,127 @@
</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"> <ul class="subsubsub">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-$type_links = array();
-$_num_posts = (array) wp_count_attachments();
-$matches = wp_match_mime_types( array_keys( $post_mime_types ), array_keys( $_num_posts ) );
-foreach ( $matches as $_type => $reals ) {
- foreach ( $reals as $real ) {
- if ( isset( $num_posts[ $_type ] ) ) {
- $num_posts[ $_type ] += $_num_posts[ $real ];
- } else {
- $num_posts[ $_type ] = $_num_posts[ $real ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $type_links = array();
+ $_num_posts = (array) wp_count_attachments();
+ $matches = wp_match_mime_types( array_keys( $post_mime_types ), array_keys( $_num_posts ) );
+ foreach ( $matches as $_type => $reals ) {
+ foreach ( $reals as $real ) {
+ if ( isset( $num_posts[ $_type ] ) ) {
+ $num_posts[ $_type ] += $_num_posts[ $real ];
+ } else {
+ $num_posts[ $_type ] = $_num_posts[ $real ];
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
-// If available type specified by media button clicked, filter by that type
-if ( empty( $_GET['post_mime_type'] ) && ! empty( $num_posts[ $type ] ) ) {
- $_GET['post_mime_type'] = $type;
- list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query();
-}
-if ( empty( $_GET['post_mime_type'] ) || $_GET['post_mime_type'] == 'all' ) {
- $class = ' class="current"';
-} else {
- $class = '';
-}
-$type_links[] = '<li><a href="' . esc_url(
- add_query_arg(
- array(
- 'post_mime_type' => 'all',
- 'paged' => false,
- 'm' => false,
- )
- )
-) . '"' . $class . '>' . __( 'All Types' ) . '</a>';
-foreach ( $post_mime_types as $mime_type => $label ) {
- $class = '';
-
- if ( ! wp_match_mime_types( $mime_type, $avail_post_mime_types ) ) {
- continue;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If available type specified by media button clicked, filter by that type
+ if ( empty( $_GET['post_mime_type'] ) && ! empty( $num_posts[ $type ] ) ) {
+ $_GET['post_mime_type'] = $type;
+ list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_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">-
- if ( isset( $_GET['post_mime_type'] ) && wp_match_mime_types( $mime_type, $_GET['post_mime_type'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $_GET['post_mime_type'] ) || $_GET['post_mime_type'] == 'all' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $class = ' class="current"';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ $class = '';
</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"> $type_links[] = '<li><a href="' . esc_url(
</span><span class="cx" style="display: block; padding: 0 10px"> add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_mime_type' => $mime_type,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_mime_type' => 'all',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'paged' => false,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'm' => false,
</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">- ) . '"' . $class . '>' . sprintf( translate_nooped_plural( $label[2], $num_posts[ $mime_type ] ), '<span id="' . $mime_type . '-counter">' . number_format_i18n( $num_posts[ $mime_type ] ) . '</span>' ) . '</a>';
-}
-/**
- * Filters the media upload mime type list items.
- *
- * Returned values should begin with an `<li>` tag.
- *
- * @since 3.1.0
- *
- * @param string[] $type_links An array of list items containing mime type link HTML.
- */
-echo implode( ' | </li>', apply_filters( 'media_upload_mime_type_links', $type_links ) ) . '</li>';
-unset( $type_links );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) . '"' . $class . '>' . __( 'All Types' ) . '</a>';
+ foreach ( $post_mime_types as $mime_type => $label ) {
+ $class = '';
+
+ if ( ! wp_match_mime_types( $mime_type, $avail_post_mime_types ) ) {
+ continue;
+ }
+
+ if ( isset( $_GET['post_mime_type'] ) && wp_match_mime_types( $mime_type, $_GET['post_mime_type'] ) ) {
+ $class = ' class="current"';
+ }
+
+ $type_links[] = '<li><a href="' . esc_url(
+ add_query_arg(
+ array(
+ 'post_mime_type' => $mime_type,
+ 'paged' => false,
+ )
+ )
+ ) . '"' . $class . '>' . sprintf( translate_nooped_plural( $label[2], $num_posts[ $mime_type ] ), '<span id="' . $mime_type . '-counter">' . number_format_i18n( $num_posts[ $mime_type ] ) . '</span>' ) . '</a>';
+ }
+ /**
+ * Filters the media upload mime type list items.
+ *
+ * Returned values should begin with an `<li>` tag.
+ *
+ * @since 3.1.0
+ *
+ * @param string[] $type_links An array of list items containing mime type link HTML.
+ */
+ echo implode( ' | </li>', apply_filters( 'media_upload_mime_type_links', $type_links ) ) . '</li>';
+ unset( $type_links );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="tablenav">
</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
-$page_links = paginate_links(
- array(
- 'base' => add_query_arg( 'paged', '%#%' ),
- 'format' => '',
- 'prev_text' => __( '«' ),
- 'next_text' => __( '»' ),
- 'total' => ceil( $wp_query->found_posts / 10 ),
- 'current' => $q['paged'],
- )
-);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $page_links = paginate_links(
+ array(
+ 'base' => add_query_arg( 'paged', '%#%' ),
+ 'format' => '',
+ 'prev_text' => __( '«' ),
+ 'next_text' => __( '»' ),
+ 'total' => ceil( $wp_query->found_posts / 10 ),
+ 'current' => $q['paged'],
+ )
+ );
</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 ( $page_links ) {
- echo "<div class='tablenav-pages'>$page_links</div>";
-}
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $page_links ) {
+ echo "<div class='tablenav-pages'>$page_links</div>";
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="alignleft actions">
</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
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'attachment' ORDER BY post_date DESC";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'attachment' ORDER BY post_date DESC";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$arc_result = $wpdb->get_results( $arc_query );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $arc_result = $wpdb->get_results( $arc_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">-$month_count = count( $arc_result );
-$selected_month = isset( $_GET['m'] ) ? $_GET['m'] : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $month_count = count( $arc_result );
+ $selected_month = isset( $_GET['m'] ) ? $_GET['m'] : 0;
</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 ( $month_count && ! ( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) {
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $month_count && ! ( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) {
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <select name='m'>
</span><span class="cx" style="display: block; padding: 0 10px"> <option<?php selected( $selected_month, 0 ); ?> value='0'><?php _e( 'All dates' ); ?></option>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-foreach ( $arc_result as $arc_row ) {
- if ( $arc_row->yyear == 0 ) {
- continue;
- }
- $arc_row->mmonth = zeroise( $arc_row->mmonth, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ foreach ( $arc_result as $arc_row ) {
+ if ( $arc_row->yyear == 0 ) {
+ continue;
+ }
+ $arc_row->mmonth = zeroise( $arc_row->mmonth, 2 );
</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 ( $arc_row->yyear . $arc_row->mmonth == $selected_month ) {
- $default = ' selected="selected"';
- } else {
- $default = '';
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $arc_row->yyear . $arc_row->mmonth == $selected_month ) {
+ $default = ' selected="selected"';
+ } else {
+ $default = '';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "<option$default value='" . esc_attr( $arc_row->yyear . $arc_row->mmonth ) . "'>";
- echo esc_html( $wp_locale->get_month( $arc_row->mmonth ) . " $arc_row->yyear" );
- echo "</option>\n";
-}
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo "<option$default value='" . esc_attr( $arc_row->yyear . $arc_row->mmonth ) . "'>";
+ echo esc_html( $wp_locale->get_month( $arc_row->mmonth ) . " $arc_row->yyear" );
+ echo "</option>\n";
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </select>
</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 } ?>
</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 submit_button( __( 'Filter »' ), '', 'post-query-submit', false ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( __( 'Filter »' ), '', 'post-query-submit', false ); ?>
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2680,8 +2693,8 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php wp_nonce_field( 'media-form' ); ?>
-<?php //media_upload_form( $errors ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( 'media-form' ); ?>
+ <?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"> <!--
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2696,15 +2709,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="media-items">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 ); ?>
-<?php echo get_media_items( null, $errors ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 ); ?>
+ <?php echo get_media_items( null, $errors ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="ml-submit">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php submit_button( __( 'Save all changes' ), 'savebutton', 'save', false ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( __( 'Save all changes' ), 'savebutton', 'save', false ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -2868,15 +2881,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $a = '<a href="' . esc_url( admin_url( 'options-media.php' ) ) . '" target="_blank">';
</span><span class="cx" style="display: block; padding: 0 10px"> $end = '</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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="hide-if-no-js"><label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="image_resize" type="checkbox" id="image_resize" value="true"<?php echo $checked; ?> />
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: link start tag, 2: link end tag, 3: width, 4: height */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Scale images to match the large size selected in %1$simage options%2$s (%3$d × %4$d).' ), $a, $end, (int) get_option( 'large_size_w', '1024' ), (int) get_option( 'large_size_h', '1024' ) );
</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"> </label></p>
</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
</ins><span class="cx" style="display: block; 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">@@ -2925,7 +2938,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $not_open_style = ' style="display:none"';
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="imgedit-response" id="imgedit-response-<?php echo $attachment_id; ?>"></div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2937,9 +2950,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $open ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_image_editor( $attachment_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">+ ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> elseif ( $attachment_id && wp_attachment_is( 'audio', $post ) ) :
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_maybe_generate_attachment_metadata( $post );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3024,7 +3037,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo ': ' . __( 'Displayed on attachment pages.' );
</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"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_editor( $post->post_content, 'attachment_content', $editor_args ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3055,7 +3068,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $media_dims = apply_filters( 'media_meta', $media_dims, $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $att_url = wp_get_attachment_url( $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">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="misc-pub-section misc-pub-attachment">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="attachment_url"><?php _e( 'File URL:' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" class="widefat urlfield" readonly="readonly" name="attachment_url" id="attachment_url" value="<?php echo esc_attr( $att_url ); ?>" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3077,7 +3090,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> echo strtoupper( str_replace( 'image/', '', $post->post_mime_type ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </strong>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3122,7 +3135,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"> 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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="misc-pub-section misc-pub-mime-meta misc-pub-<?php echo sanitize_html_class( $key ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $label; ?> <strong>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3137,10 +3150,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo esc_html( $meta[ $key ] );
</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </strong>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3166,20 +3179,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $meta['audio'][ $key ] ) ) {
</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="misc-pub-section misc-pub-audio misc-pub-<?php echo sanitize_html_class( $key ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $label; ?> <strong><?php echo esc_html( $meta['audio'][ $key ] ); ?></strong>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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 ( $media_dims ) :
</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"> <div class="misc-pub-section misc-pub-dimensions">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Dimensions:' ); ?> <strong><?php echo $media_dims; ?></strong>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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">
</span></span></pre></div>
<a id="trunksrcwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/meta-boxes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/meta-boxes.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/meta-boxes.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,25 +25,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = $post->post_type;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_object = get_post_type_object( $post_type );
</span><span class="cx" style="display: block; padding: 0 10px"> $can_publish = current_user_can( $post_type_object->cap->publish_posts );
</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"> <div class="submitbox" id="submitpost">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="minor-publishing">
</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 // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div style="display:none;">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php submit_button( __( 'Save' ), '', 'save' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( __( 'Save' ), '', 'save' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="minor-publishing-actions">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="save-action">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status ) {
- $private_style = '';
- if ( 'private' == $post->post_status ) {
- $private_style = 'style="display:none"';
- }
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status ) {
+ $private_style = '';
+ if ( 'private' == $post->post_status ) {
+ $private_style = 'style="display:none"';
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input <?php echo $private_style; ?> type="submit" name="save" id="save-post" value="<?php esc_attr_e( 'Save Draft' ); ?>" class="button" />
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="spinner"></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } elseif ( 'pending' == $post->post_status && $can_publish ) { ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,37 +51,37 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="spinner"></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><span class="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_post_type_viewable( $post_type_object ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( is_post_type_viewable( $post_type_object ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="preview-action">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-$preview_link = esc_url( get_preview_post_link( $post ) );
-if ( 'publish' == $post->post_status ) {
- $preview_button_text = __( 'Preview Changes' );
-} else {
- $preview_button_text = __( 'Preview' );
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $preview_link = esc_url( get_preview_post_link( $post ) );
+ if ( 'publish' == $post->post_status ) {
+ $preview_button_text = __( 'Preview Changes' );
+ } else {
+ $preview_button_text = __( 'Preview' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$preview_button = sprintf(
- '%1$s<span class="screen-reader-text"> %2$s</span>',
- $preview_button_text,
- /* translators: accessibility text */
- __( '(opens in a new tab)' )
-);
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $preview_button = sprintf(
+ '%1$s<span class="screen-reader-text"> %2$s</span>',
+ $preview_button_text,
+ /* translators: accessibility text */
+ __( '(opens in a new tab)' )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a class="preview button" href="<?php echo $preview_link; ?>" target="wp-preview-<?php echo (int) $post->ID; ?>" id="post-preview"><?php echo $preview_button; ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="wp-preview" id="wp-preview" value="" />
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // public post type ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Fires before the post time/date setting in the Publish meta box.
- *
- * @since 4.4.0
- *
- * @param WP_Post $post WP_Post object for the current post.
- */
-do_action( 'post_submitbox_minor_actions', $post );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Fires before the post time/date setting in the Publish meta box.
+ *
+ * @since 4.4.0
+ *
+ * @param WP_Post $post WP_Post object for the current post.
+ */
+ do_action( 'post_submitbox_minor_actions', $post );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="clear"></div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #minor-publishing-actions -->
</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"> <div id="misc-publishing-actions">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="misc-pub-section misc-pub-post-status">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php _e( 'Status:' ); ?> <span id="post-status-display">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e( 'Status:' ); ?> <span id="post-status-display">
</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"> switch ( $post->post_status ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,15 +109,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _e( 'Draft' );
</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">-?>
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_publish ) {
- $private_style = '';
- if ( 'private' == $post->post_status ) {
- $private_style = 'style="display:none"';
- }
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_publish ) {
+ $private_style = '';
+ if ( 'private' == $post->post_status ) {
+ $private_style = 'style="display:none"';
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a href="#post_status" <?php echo $private_style; ?> class="edit-post-status hide-if-no-js" role="button"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit status' ); ?></span></a>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-status-select" class="hide-if-js">
</span><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"> <input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo esc_attr( ( 'auto-draft' == $post->post_status ) ? 'draft' : $post->post_status ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="post_status" class="screen-reader-text"><?php _e( 'Set status' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <select name="post_status" id="post_status">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( 'publish' == $post->post_status ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'publish' == $post->post_status ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <option<?php selected( $post->post_status, 'publish' ); ?> value='publish'><?php _e( 'Published' ); ?></option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( 'private' == $post->post_status ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <option<?php selected( $post->post_status, 'private' ); ?> value='publish'><?php _e( 'Privately Published' ); ?></option>
</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"> <option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e( 'Scheduled' ); ?></option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e( 'Pending Review' ); ?></option>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( 'auto-draft' == $post->post_status ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'auto-draft' == $post->post_status ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <option<?php selected( $post->post_status, 'auto-draft' ); ?> value='draft'><?php _e( 'Draft' ); ?></option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e( 'Draft' ); ?></option>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +146,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .misc-pub-section -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="misc-pub-section misc-pub-visibility" id="visibility">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php _e( 'Visibility:' ); ?> <span id="post-visibility-display">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e( 'Visibility:' ); ?> <span id="post-visibility-display">
</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"> if ( 'private' == $post->post_status ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,19 +165,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"> echo esc_html( $visibility_trans );
</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"> </span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( $can_publish ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $can_publish ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a href="#visibility" class="edit-visibility hide-if-no-js" role="button"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit visibility' ); ?></span></a>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-visibility-select" class="hide-if-js">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="hidden_post_password" id="hidden-post-password" value="<?php echo esc_attr( $post->post_password ); ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( $post_type == 'post' ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $post_type == 'post' ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="checkbox" style="display:none" name="hidden_post_sticky" id="hidden-post-sticky" value="sticky" <?php checked( is_sticky( $post->ID ) ); ?> />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="hidden_post_visibility" id="hidden-post-visibility" value="<?php echo esc_attr( $visibility ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="radio" name="visibility" id="visibility-radio-public" value="public" <?php checked( $visibility, 'public' ); ?> /> <label for="visibility-radio-public" class="selectit"><?php _e( 'Public' ); ?></label><br />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( $post_type == 'post' && current_user_can( 'edit_others_posts' ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $post_type == 'post' && current_user_can( 'edit_others_posts' ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span id="sticky-span"><input id="sticky" name="sticky" type="checkbox" value="sticky" <?php checked( is_sticky( $post->ID ) ); ?> /> <label for="sticky" class="selectit"><?php _e( 'Stick this post to the front page' ); ?></label><br /></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="radio" name="visibility" id="visibility-radio-password" value="password" <?php checked( $visibility, 'password' ); ?> /> <label for="visibility-radio-password" class="selectit"><?php _e( 'Password protected' ); ?></label><br />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,57 +193,57 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .misc-pub-section -->
</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
-/* translators: Publish box date format, see https://secure.php.net/date */
-$datef = __( 'M j, Y @ H:i' );
-if ( 0 != $post->ID ) {
- if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
- /* translators: Post date information. %s: Date on which the post is currently scheduled to be published */
- $stamp = __( 'Scheduled for: <b>%s</b>' );
- } elseif ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // already published
- /* translators: Post date information. %s: Date on which the post was published */
- $stamp = __( 'Published on: <b>%s</b>' );
- } elseif ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // draft, 1 or more saves, no date specified
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /* translators: Publish box date format, see https://secure.php.net/date */
+ $datef = __( 'M j, Y @ H:i' );
+ if ( 0 != $post->ID ) {
+ if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
+ /* translators: Post date information. %s: Date on which the post is currently scheduled to be published */
+ $stamp = __( 'Scheduled for: <b>%s</b>' );
+ } elseif ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // already published
+ /* translators: Post date information. %s: Date on which the post was published */
+ $stamp = __( 'Published on: <b>%s</b>' );
+ } elseif ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // draft, 1 or more saves, no date specified
+ $stamp = __( 'Publish <b>immediately</b>' );
+ } elseif ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // draft, 1 or more saves, future date specified
+ /* translators: Post date information. %s: Date on which the post is to be published */
+ $stamp = __( 'Schedule for: <b>%s</b>' );
+ } else { // draft, 1 or more saves, date specified
+ /* translators: Post date information. %s: Date on which the post is to be published */
+ $stamp = __( 'Publish on: <b>%s</b>' );
+ }
+ $date = date_i18n( $datef, strtotime( $post->post_date ) );
+ } else { // draft (no saves, and thus no date specified)
</ins><span class="cx" style="display: block; padding: 0 10px"> $stamp = __( 'Publish <b>immediately</b>' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // draft, 1 or more saves, future date specified
- /* translators: Post date information. %s: Date on which the post is to be published */
- $stamp = __( 'Schedule for: <b>%s</b>' );
- } else { // draft, 1 or more saves, date specified
- /* translators: Post date information. %s: Date on which the post is to be published */
- $stamp = __( 'Publish on: <b>%s</b>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $date = date_i18n( $datef, strtotime( current_time( 'mysql' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $date = date_i18n( $datef, strtotime( $post->post_date ) );
-} else { // draft (no saves, and thus no date specified)
- $stamp = __( 'Publish <b>immediately</b>' );
- $date = date_i18n( $datef, strtotime( current_time( 'mysql' ) ) );
-}
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! empty( $args['args']['revisions_count'] ) ) :
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $args['args']['revisions_count'] ) ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="misc-pub-section misc-pub-revisions">
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: Post revisions heading. %s: The number of available revisions */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Revisions: %s' ), '<b>' . number_format_i18n( $args['args']['revisions_count'] ) . '</b>' );
</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"> <a class="hide-if-no-js" href="<?php echo esc_url( get_edit_post_link( $args['args']['revision_id'] ) ); ?>"><span aria-hidden="true"><?php _ex( 'Browse', 'revisions' ); ?></span> <span class="screen-reader-text"><?php _e( 'Browse revisions' ); ?></span></a>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><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">-if ( $can_publish ) : // Contributors don't get to choose the date of publish
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $can_publish ) : // Contributors don't get to choose the date of publish
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="misc-pub-section curtime misc-pub-curtime">
</span><span class="cx" style="display: block; padding: 0 10px"> <span id="timestamp">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( $stamp, $date ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php printf( $stamp, $date ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" role="button"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit date and time' ); ?></span></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <fieldset id="timestampdiv" class="hide-if-js">
</span><span class="cx" style="display: block; padding: 0 10px"> <legend class="screen-reader-text"><?php _e( 'Date and time' ); ?></legend>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php touch_time( ( $action === 'edit' ), 1 ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php touch_time( ( $action === 'edit' ), 1 ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><?php // /misc-pub-section ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( 'draft' === $post->post_status && get_post_meta( $post->ID, '_customize_changeset_uuid', true ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'draft' === $post->post_status && get_post_meta( $post->ID, '_customize_changeset_uuid', true ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="notice notice-info notice-alt inline">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,84 +261,84 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endif; ?>
</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
-/**
- * Fires after the post time/date setting in the Publish meta box.
- *
- * @since 2.9.0
- * @since 4.4.0 Added the `$post` parameter.
- *
- * @param WP_Post $post WP_Post object for the current post.
- */
-do_action( 'post_submitbox_misc_actions', $post );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Fires after the post time/date setting in the Publish meta box.
+ *
+ * @since 2.9.0
+ * @since 4.4.0 Added the `$post` parameter.
+ *
+ * @param WP_Post $post WP_Post object for the current post.
+ */
+ do_action( 'post_submitbox_misc_actions', $post );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="clear"></div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="major-publishing-actions">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Fires at the beginning of the publishing actions section of the Publish meta box.
- *
- * @since 2.7.0
- * @since 4.9.0 Added the `$post` parameter.
- *
- * @param WP_Post|null $post WP_Post object for the current post on Edit Post screen,
- * null on Edit Link screen.
- */
-do_action( 'post_submitbox_start', $post );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Fires at the beginning of the publishing actions section of the Publish meta box.
+ *
+ * @since 2.7.0
+ * @since 4.9.0 Added the `$post` parameter.
+ *
+ * @param WP_Post|null $post WP_Post object for the current post on Edit Post screen,
+ * null on Edit Link screen.
+ */
+ do_action( 'post_submitbox_start', $post );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="delete-action">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-if ( current_user_can( 'delete_post', $post->ID ) ) {
- if ( ! EMPTY_TRASH_DAYS ) {
- $delete_text = __( 'Delete Permanently' );
- } else {
- $delete_text = __( 'Move to Trash' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( current_user_can( 'delete_post', $post->ID ) ) {
+ if ( ! EMPTY_TRASH_DAYS ) {
+ $delete_text = __( 'Delete Permanently' );
+ } else {
+ $delete_text = __( 'Move to Trash' );
+ }
+ ?>
+<a class="submitdelete deletion" href="<?php echo get_delete_post_link( $post->ID ); ?>"><?php echo $delete_text; ?></a>
+ <?php
</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">-<a class="submitdelete deletion" href="<?php echo get_delete_post_link( $post->ID ); ?>"><?php echo $delete_text; ?></a>
- <?php
-}
-?>
</del><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="publishing-action">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="spinner"></span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-if ( ! in_array( $post->post_status, array( 'publish', 'future', 'private' ) ) || 0 == $post->ID ) {
- if ( $can_publish ) :
- if ( ! empty( $post->post_date_gmt ) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) :
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( ! in_array( $post->post_status, array( 'publish', 'future', 'private' ) ) || 0 == $post->ID ) {
+ if ( $can_publish ) :
+ if ( ! empty( $post->post_date_gmt ) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input name="original_publish" type="hidden" id="original_publish" value="<?php echo esc_attr_x( 'Schedule', 'post action/button label' ); ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php submit_button( _x( 'Schedule', 'post action/button label' ), 'primary large', 'publish', false ); ?>
-<?php else : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( _x( 'Schedule', 'post action/button label' ), 'primary large', 'publish', false ); ?>
+ <?php else : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e( 'Publish' ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button( __( 'Publish' ), 'primary large', 'publish', false ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-endif;
</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"> else :
</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"> <input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e( 'Submit for Review' ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button( __( 'Submit for Review' ), 'primary large', 'publish', false ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
- endif;
-} else {
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ endif;
+ } else {
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e( 'Update' ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="save" type="submit" class="button button-primary button-large" id="publish" value="<?php esc_attr_e( 'Update' ); ?>" />
</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
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="clear"></div>
</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">
</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
</ins><span class="cx" style="display: block; 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">@@ -349,14 +349,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $post
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function attachment_submit_meta_box( $post ) {
</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"> <div class="submitbox" id="submitpost">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="minor-publishing">
</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 // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div style="display:none;">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php submit_button( __( 'Save' ), '', 'save' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( __( 'Save' ), '', 'save' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -449,7 +449,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post_format && ! in_array( $post_format, $post_formats[0] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_formats[0][] = $post_format;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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"> <div id="post-formats-select">
</span><span class="cx" style="display: block; padding: 0 10px"> <fieldset>
</span><span class="cx" style="display: block; padding: 0 10px"> <legend class="screen-reader-text"><?php _e( 'Post Formats' ); ?></legend>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -459,7 +459,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> endif;
</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">@@ -501,7 +501,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_string( $terms_to_edit ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $terms_to_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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="tagsdiv" id="<?php echo $tax_name; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="jaxtag">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="nojs-tags hide-if-js">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -521,10 +521,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul class="tagchecklist" role="list"></ul>
</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 ( $user_can_assign_terms ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $user_can_assign_terms ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="hide-if-no-js"><button type="button" class="button-link tagcloud-link" id="link-<?php echo $tax_name; ?>" aria-expanded="false"><?php echo $taxonomy->labels->choose_from_most_used; ?></button></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -579,12 +579,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <ul id="<?php echo $tax_name; ?>checklist" data-wp-lists="list:<?php echo $tax_name; ?>" class="categorychecklist form-no-clear">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> wp_terms_checklist(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post->ID, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post->ID,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $tax_name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'popular_cats' => $popular_ids,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( current_user_can( $taxonomy->cap->edit_terms ) ) : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -657,18 +658,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $post
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function post_excerpt_meta_box( $post ) {
</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"> <label class="screen-reader-text" for="excerpt"><?php _e( 'Excerpt' ); ?></label><textarea rows="1" cols="40" name="excerpt" id="excerpt"><?php echo $post->post_excerpt; // textarea_escaped ?></textarea>
</span><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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Codex URL */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Excerpts are optional hand-crafted summaries of your content that can be used in your theme. <a href="%s">Learn more about manual excerpts</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://codex.wordpress.org/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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -690,7 +691,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $pings .= '</ul>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="trackback_url"><?php _e( 'Send trackbacks to:' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $form_trackback; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -697,19 +698,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p id="trackback-url-desc" class="howto"><?php _e( 'Separate multiple URLs with spaces' ); ?></p>
</span><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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Codex URL */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Trackbacks are a way to notify legacy blog systems that you’ve linked to them. If you link other WordPress sites, they’ll be notified automatically using <a href="%s">pingbacks</a>, no other action necessary.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://codex.wordpress.org/Introduction_to_Blogging#Managing_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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</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 ( ! empty( $pings ) ) {
- echo $pings;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( ! empty( $pings ) ) {
+ echo $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">-}
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Display custom fields form fields.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -719,30 +720,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $post
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function post_custom_meta_box( $post ) {
</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"> <div id="postcustomstuff">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="ajax-response"></div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-$metadata = has_meta( $post->ID );
-foreach ( $metadata as $key => $value ) {
- if ( is_protected_meta( $metadata[ $key ]['meta_key'], 'post' ) || ! current_user_can( 'edit_post_meta', $post->ID, $metadata[ $key ]['meta_key'] ) ) {
- unset( $metadata[ $key ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $metadata = has_meta( $post->ID );
+ foreach ( $metadata as $key => $value ) {
+ if ( is_protected_meta( $metadata[ $key ]['meta_key'], 'post' ) || ! current_user_can( 'edit_post_meta', $post->ID, $metadata[ $key ]['meta_key'] ) ) {
+ unset( $metadata[ $key ] );
+ }
</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_meta( $metadata );
-meta_form( $post );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ list_meta( $metadata );
+ meta_form( $post );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Codex URL */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Custom fields can be used to add extra metadata to a post that you can <a href="%s">use in your theme</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://codex.wordpress.org/Using_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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -753,7 +754,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $post
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function post_comment_status_meta_box( $post ) {
</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"> <input name="advanced_view" type="hidden" value="1" />
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="meta-options">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="comment_status" class="selectit"><input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked( $post->comment_status, 'open' ); ?> /> <?php _e( 'Allow comments' ); ?></label><br />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -777,7 +778,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'post_comment_status_meta_box-options', $post );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -844,9 +845,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function post_slug_meta_box( $post ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/edit-tag-form.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $editable_slug = apply_filters( 'editable_slug', $post->post_name, $post );
</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"> <label class="screen-reader-text" for="post_name"><?php _e( 'Slug' ); ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo esc_attr( $editable_slug ); ?>" />
</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
</ins><span class="cx" style="display: block; 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">@@ -860,9 +861,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function post_author_meta_box( $post ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $user_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">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <label class="screen-reader-text" for="post_author_override"><?php _e( 'Author' ); ?></label>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_dropdown_users(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'who' => 'authors',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -919,10 +920,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $dropdown_args = apply_filters( 'page_attributes_dropdown_pages_args', $dropdown_args, $post );
</span><span class="cx" style="display: block; padding: 0 10px"> $pages = wp_dropdown_pages( $dropdown_args );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $pages ) ) :
</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"> <p class="post-attributes-label-wrapper"><label class="post-attributes-label" for="parent_id"><?php _e( 'Parent' ); ?></label></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php echo $pages; ?>
-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo $pages; ?>
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> endif; // end empty pages check
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // end hierarchical check.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -930,54 +931,54 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $template = ! empty( $post->page_template ) ? $post->page_template : false;
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="post-attributes-label-wrapper"><label class="post-attributes-label" for="page_template"><?php _e( 'Template' ); ?></label>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Fires immediately after the label inside the 'Template' section
- * of the 'Page Attributes' meta box.
- *
- * @since 4.4.0
- *
- * @param string $template The template used for the current post.
- * @param WP_Post $post The current post.
- */
-do_action( 'page_attributes_meta_box_template', $template, $post );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Fires immediately after the label inside the 'Template' section
+ * of the 'Page Attributes' meta box.
+ *
+ * @since 4.4.0
+ *
+ * @param string $template The template used for the current post.
+ * @param WP_Post $post The current post.
+ */
+ do_action( 'page_attributes_meta_box_template', $template, $post );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <select name="page_template" id="page_template">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Filters the title of the default page template displayed in the drop-down.
- *
- * @since 4.1.0
- *
- * @param string $label The display value for the default page template title.
- * @param string $context Where the option label is displayed. Possible values
- * include 'meta-box' or 'quick-edit'.
- */
-$default_title = apply_filters( 'default_page_template_title', __( 'Default Template' ), 'meta-box' );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Filters the title of the default page template displayed in the drop-down.
+ *
+ * @since 4.1.0
+ *
+ * @param string $label The display value for the default page template title.
+ * @param string $context Where the option label is displayed. Possible values
+ * include 'meta-box' or 'quick-edit'.
+ */
+ $default_title = apply_filters( 'default_page_template_title', __( 'Default Template' ), 'meta-box' );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <option value="default"><?php echo esc_html( $default_title ); ?></option>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php page_template_dropdown( $template, $post->post_type ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php page_template_dropdown( $template, $post->post_type ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( post_type_supports( $post->post_type, 'page-attributes' ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( post_type_supports( $post->post_type, 'page-attributes' ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="post-attributes-label-wrapper"><label class="post-attributes-label" for="menu_order"><?php _e( 'Order' ); ?></label></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo esc_attr( $post->menu_order ); ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Fires before the help hint text in the 'Page Attributes' meta box.
- *
- * @since 4.9.0
- *
- * @param WP_Post $post The current post.
- */
-do_action( 'page_attributes_misc_attributes', $post );
-?>
-<?php if ( 'page' == $post->post_type && get_current_screen()->get_help_tabs() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Fires before the help hint text in the 'Page Attributes' meta box.
+ *
+ * @since 4.9.0
+ *
+ * @param WP_Post $post The current post.
+ */
+ do_action( 'page_attributes_misc_attributes', $post );
+ ?>
+ <?php if ( 'page' == $post->post_type && get_current_screen()->get_help_tabs() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Need help? Use the Help tab above the screen title.' ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ endif;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // -- Link related Meta Boxes
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -990,19 +991,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $link
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function link_submit_meta_box( $link ) {
</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"> <div class="submitbox" id="submitlink">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="minor-publishing">
</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 // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div style="display:none;">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php submit_button( __( 'Save' ), '', 'save', false ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( __( 'Save' ), '', 'save', false ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="minor-publishing-actions">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="preview-action">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( ! empty( $link->link_id ) ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! empty( $link->link_id ) ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a class="preview button" href="<?php echo $link->link_url; ?>" target="_blank"><?php _e( 'Visit Link' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1018,20 +1019,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="major-publishing-actions">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/** This action is documented in wp-admin/includes/meta-boxes.php */
-do_action( 'post_submitbox_start', null );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /** This action is documented in wp-admin/includes/meta-boxes.php */
+ do_action( 'post_submitbox_start', null );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="delete-action">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-if ( ! empty( $_GET['action'] ) && 'edit' == $_GET['action'] && current_user_can( 'manage_links' ) ) {
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( ! empty( $_GET['action'] ) && 'edit' == $_GET['action'] && current_user_can( 'manage_links' ) ) {
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a class="submitdelete deletion" href="<?php echo wp_nonce_url( "link.php?action=delete&link_id=$link->link_id", 'delete-bookmark_' . $link->link_id ); ?>" onclick="if ( confirm('<?php echo esc_js( sprintf( __( "You are about to delete this link '%s'\n 'Cancel' to stop, 'OK' to delete." ), $link->link_name ) ); ?>') ) {return true;}return false;"><?php _e( 'Delete' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="publishing-action">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( ! empty( $link->link_id ) ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! empty( $link->link_id ) ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input name="save" type="submit" class="button button-primary button-large" id="publish" value="<?php esc_attr_e( 'Update Link' ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } else { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="save" type="submit" class="button button-primary button-large" id="publish" value="<?php esc_attr_e( 'Add Link' ); ?>" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1039,17 +1040,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="clear"></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
-/**
- * Fires at the end of the Publish box in the Link editing screen.
- *
- * @since 2.5.0
- */
-do_action( 'submitlink_box' );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Fires at the end of the Publish box in the Link editing screen.
+ *
+ * @since 2.5.0
+ */
+ do_action( 'submitlink_box' );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="clear"></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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -1060,7 +1061,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $link
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function link_categories_meta_box( $link ) {
</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"> <div id="taxonomy-linkcategory" class="categorydiv">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul id="category-tabs" class="category-tabs">
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="tabs"><a href="#categories-all"><?php _e( 'All Categories' ); ?></a></li>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1096,7 +1097,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><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">-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -1108,20 +1109,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function link_target_meta_box( $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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <fieldset><legend class="screen-reader-text"><span><?php _e( 'Target' ); ?></span></legend>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><label for="link_target_blank" class="selectit">
</span><span class="cx" style="display: block; padding: 0 10px"> <input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo ( isset( $link->link_target ) && ( $link->link_target == '_blank' ) ? 'checked="checked"' : '' ); ?> />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php _e( '<code>_blank</code> — new window or tab.' ); ?></label></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e( '<code>_blank</code> — new window or tab.' ); ?></label></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><label for="link_target_top" class="selectit">
</span><span class="cx" style="display: block; padding: 0 10px"> <input id="link_target_top" type="radio" name="link_target" value="_top" <?php echo ( isset( $link->link_target ) && ( $link->link_target == '_top' ) ? 'checked="checked"' : '' ); ?> />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php _e( '<code>_top</code> — current window or tab, with no frames.' ); ?></label></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e( '<code>_top</code> — current window or tab, with no frames.' ); ?></label></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><label for="link_target_none" class="selectit">
</span><span class="cx" style="display: block; padding: 0 10px"> <input id="link_target_none" type="radio" name="link_target" value="" <?php echo ( isset( $link->link_target ) && ( $link->link_target == '' ) ? 'checked="checked"' : '' ); ?> />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php _e( '<code>_none</code> — same window or tab.' ); ?></label></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e( '<code>_none</code> — same window or tab.' ); ?></label></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Choose the target frame for your link.' ); ?></p>
</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
</ins><span class="cx" style="display: block; 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">@@ -1173,7 +1174,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $link
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function link_xfn_meta_box( $link ) {
</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"> <table class="links-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="link_rel"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'rel:' ); ?></label></th>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1280,7 +1281,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"> <p><?php _e( 'If the link is to a person, you can specify your relationship with them using the above form. If you would like to learn more about the idea check out <a href="http://gmpg.org/xfn/">XFN</a>.' ); ?></p>
</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
</ins><span class="cx" style="display: block; 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">@@ -1291,7 +1292,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $link
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function link_advanced_meta_box( $link ) {
</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"> <table class="links-table" cellpadding="0">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="link_image"><?php _e( 'Image Address' ); ?></label></th>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1321,7 +1322,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</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
</ins><span class="cx" style="display: block; 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">@@ -1354,11 +1355,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $meta[ $key ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = $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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="title"><?php echo $label; ?></label><br />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" name="id3_<?php echo esc_attr( $key ); ?>" id="id3_<?php echo esc_attr( $key ); ?>" class="large-text" value="<?php echo esc_attr( $value ); ?>" />
</span><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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> endforeach;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesmiscphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/misc.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/misc.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/misc.php 2018-08-17 01:50:26 UTC (rev 43571)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> // Generate the new file data
</span><span class="cx" style="display: block; padding: 0 10px"> $new_file_data = implode(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "\n", array_merge(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "\n",
+ array_merge(
</ins><span class="cx" style="display: block; padding: 0 10px"> $pre_lines,
</span><span class="cx" style="display: block; padding: 0 10px"> array( $start_marker ),
</span><span class="cx" style="display: block; padding: 0 10px"> $insertion,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -855,7 +856,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fresh' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'light' => '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $_wp_admin_css_colors
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $_wp_admin_css_colors
</ins><span class="cx" style="display: block; 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">@@ -897,7 +899,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> endforeach;
</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"> </fieldset>
</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">@@ -1147,7 +1149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> window.history.replaceState( null, null, document.getElementById( 'wp-admin-canonical' ).href + window.location.hash );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</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
</ins><span class="cx" style="display: block; 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">@@ -1428,13 +1430,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"> <div class="policy-text-updated notice notice-warning">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Privacy Policy Guide URL */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The suggested privacy policy text has changed. Please <a href="%s">review the guide</a> and update your privacy policy.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( admin_url( 'tools.php?wp-privacy-policy-guide=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">- ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ </p>
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1453,8 +1457,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"> // Remove updated|removed status.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $old = (array) get_post_meta( $policy_page_id, '_wp_suggested_privacy_policy_content' );
- $done = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $old = (array) get_post_meta( $policy_page_id, '_wp_suggested_privacy_policy_content' );
+ $done = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> $update_cache = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $old as $old_key => $old_data ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1466,7 +1470,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $old_data['updated'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // 'updated' is now 'added'.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $done[] = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $done[] = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'plugin_name' => $old_data['plugin_name'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'policy_text' => $old_data['policy_text'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'added' => $old_data['updated'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1497,11 +1501,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_suggested_policy_text() {
</span><span class="cx" style="display: block; padding: 0 10px"> $policy_page_id = (int) get_option( 'wp_page_for_privacy_policy' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $checked = array();
- $time = time();
- $update_cache = false;
- $new = self::$policy_content;
- $old = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $checked = array();
+ $time = time();
+ $update_cache = false;
+ $new = self::$policy_content;
+ $old = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $policy_page_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $old = (array) get_post_meta( $policy_page_id, '_wp_suggested_privacy_policy_content' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1516,7 +1520,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Use the new plugin name in case it was changed, translated, etc.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $old_data['plugin_name'] !== $new_data['plugin_name'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $old_data['plugin_name'] = $new_data['plugin_name'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $update_cache = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $update_cache = 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"> // A plugin was re-activated.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1523,11 +1527,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $old_data['removed'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $old_data['removed'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $old_data['added'] = $time;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $update_cache = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $update_cache = 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"> $checked[] = $old_data;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $found = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $new_data['plugin_name'] === $old_data['plugin_name'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // The info for the policy was updated.
</span><span class="cx" style="display: block; padding: 0 10px"> $checked[] = array(
</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"> 'policy_text' => $new_data['policy_text'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'updated' => $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">- $found = $update_cache = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found = $update_cache = 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"> if ( $found ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1636,10 +1640,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content_array = self::get_suggested_policy_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">- $content = '';
- $toc = array( '<li><a href="#wp-privacy-policy-guide-introduction">' . __( 'Introduction' ) . '</a></li>' );
- $date_format = __( 'F j, Y' );
- $copy = __( 'Copy' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = '';
+ $toc = array( '<li><a href="#wp-privacy-policy-guide-introduction">' . __( 'Introduction' ) . '</a></li>' );
+ $date_format = __( 'F j, Y' );
+ $copy = __( 'Copy' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $return_to_top = '<a href="#" class="return-to-top">' . __( '↑ Return to Top' ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $content_array as $section ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1647,7 +1651,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $section['removed'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $class = ' text-removed';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $date = date_i18n( $date_format, $section['removed'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $date = date_i18n( $date_format, $section['removed'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $meta = sprintf( __( 'Removed %s.' ), $date );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $removed = __( 'You deactivated this plugin on %s and may no longer need this policy.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1654,7 +1658,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $removed = '<div class="error inline"><p>' . sprintf( $removed, $date ) . '</p></div>';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $section['updated'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $class = ' text-updated';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $date = date_i18n( $date_format, $section['updated'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $date = date_i18n( $date_format, $section['updated'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $meta = sprintf( __( 'Updated %s.' ), $date );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1663,8 +1667,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"> $plugin_name = esc_html( $section['plugin_name'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $toc_id = 'wp-privacy-policy-guide-' . sanitize_title( $plugin_name );
- $toc[] = sprintf( '<li><a href="#%1$s">%2$s</a>' . $meta . '</li>', $toc_id, $plugin_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $toc_id = 'wp-privacy-policy-guide-' . sanitize_title( $plugin_name );
+ $toc[] = sprintf( '<li><a href="#%1$s">%2$s</a>' . $meta . '</li>', $toc_id, $plugin_name );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= '<div class="privacy-text-section' . $class . '">';
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= '<a id="' . $toc_id . '"> </a>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1676,12 +1680,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= $return_to_top;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $section['removed'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content .= '<div class="privacy-text-actions">';
- $content .= '<button type="button" class="privacy-text-copy button">';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content .= '<div class="privacy-text-actions">';
+ $content .= '<button type="button" class="privacy-text-copy button">';
</ins><span class="cx" style="display: block; padding: 0 10px"> $content .= $copy;
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= '<span class="screen-reader-text">' . sprintf( __( 'Copy suggested policy text from %s.' ), $plugin_name ) . '</span>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content .= '</button>';
- $content .= '</div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content .= '</button>';
+ $content .= '</div>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= "</div>\n"; // End of .privacy-text-section.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1727,17 +1731,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_default_content( $descr = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $suggested_text = $descr ? '<strong class="privacy-policy-tutorial">' . __( 'Suggested text:' ) . ' </strong>' : '';
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> // Start of the suggested privacy policy text.
</span><span class="cx" style="display: block; padding: 0 10px"> $descr && $content .=
</span><span class="cx" style="display: block; padding: 0 10px"> '<div class="wp-suggested-text">';
</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"> '<h2>' . __( 'Who we are' ) . '</h2>';
</span><span class="cx" style="display: block; padding: 0 10px"> $descr && $content .=
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="privacy-policy-tutorial">' . __( 'In this section you should note your site URL, as well as the name of the company, organization, or individual behind it, and some accurate contact information.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="privacy-policy-tutorial">' . __( 'The amount of information you may be required to show will vary depending on your local or national business regulations. You may, for example, be required to display a physical address, a registered address, or your company registration number.' ) . '</p>';
</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"> /* translators: %s Site URL */
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . $suggested_text . sprintf( __( 'Our website address is: %s.' ), get_bloginfo( 'url', 'display' ) ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1749,11 +1753,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="privacy-policy-tutorial">' . __( 'Personal data is not just created by a user’s interactions with your site. Personal data is also generated from technical processes such as contact forms, comments, cookies, analytics, and third party embeds.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="privacy-policy-tutorial">' . __( 'By default WordPress does not collect any personal data about visitors, and only collects the data shown on the User Profile screen from registered users. However some of your plugins may collect personal data. You should add the relevant information below.' ) . '</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">- $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"> '<h3>' . __( 'Comments' ) . '</h3>';
</span><span class="cx" style="display: block; padding: 0 10px"> $descr && $content .=
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should note what information is captured through comments. We have noted the data which WordPress collects by default.' ) . '</p>';
</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"> '<p>' . $suggested_text . __( 'When visitors leave comments on the site we collect the data shown in the comments form, and also the visitor’s IP address and browser user agent string to help spam detection.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'An anonymized string created from your email address (also called a hash) may be provided to the Gravatar service to see if you are using it. The Gravatar service privacy policy is available here: https://automattic.com/privacy/. After approval of your comment, your profile picture is visible to the public in the context of your comment.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1760,7 +1764,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<h3>' . __( 'Media' ) . '</h3>';
</span><span class="cx" style="display: block; padding: 0 10px"> $descr && $content .=
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should note what information may be disclosed by users who can upload media files. All uploaded files are usually publicly accessible.' ) . '</p>';
</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"> '<p>' . $suggested_text . __( 'If you upload images to the website, you should avoid uploading images with embedded location data (EXIF GPS) included. Visitors to the website can download and extract any location data from images on the website.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> '<h3>' . __( 'Contact forms' ) . '</h3>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1767,11 +1771,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $descr && $content .=
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="privacy-policy-tutorial">' . __( 'By default, WordPress does not include a contact form. If you use a contact form plugin, use this subsection to note what personal data is captured when someone submits a contact form, and how long you keep it. For example, you may note that you keep contact form submissions for a certain period for customer service purposes, but you do not use the information submitted through them for marketing purposes.' ) . '</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">- $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"> '<h3>' . __( 'Cookies' ) . '</h3>';
</span><span class="cx" style="display: block; padding: 0 10px"> $descr && $content .=
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should list the cookies your web site uses, including those set by your plugins, social media, and analytics. We have provided the cookies which WordPress installs by default.' ) . '</p>';
</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"> '<p>' . $suggested_text . __( 'If you leave a comment on our site you may opt-in to saving your name, email address and website in cookies. These are for your convenience so that you do not have to fill in your details again when you leave another comment. These cookies will last for one year.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'If you have an account and you log in to this site, we will set a temporary cookie to determine if your browser accepts cookies. This cookie contains no personal data and is discarded when you close your browser.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'When you log in, we will also set up several cookies to save your login information and your screen display choices. Login cookies last for two days, and screen options cookies last for a year. If you select "Remember Me", your login will persist for two weeks. If you log out of your account, the login cookies will be removed.' ) . '</p>' .
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1786,17 +1790,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should note what analytics package you use, how users can opt out of analytics tracking, and a link to your analytics provider’s privacy policy, if any.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="privacy-policy-tutorial">' . __( 'By default WordPress does not collect any analytics data. However, many web hosting accounts collect some anonymous analytics data. You may also have installed a WordPress plugin that provides analytics services. In that case, add information from that plugin here.' ) . '</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">- $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"> '<h2>' . __( 'Who we share your data with' ) . '</h2>';
</span><span class="cx" style="display: block; padding: 0 10px"> $descr && $content .=
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="privacy-policy-tutorial">' . __( 'In this section you should name and list all third party providers with whom you share site data, including partners, cloud-based services, payment processors, and third party service providers, and note what data you share with them and why. Link to their own privacy policies if possible.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="privacy-policy-tutorial">' . __( 'By default WordPress does not share any personal data with anyone.' ) . '</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">- $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"> '<h2>' . __( 'How long we retain your data' ) . '</h2>';
</span><span class="cx" style="display: block; padding: 0 10px"> $descr && $content .=
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="privacy-policy-tutorial">' . __( 'In this section you should explain how long you retain personal data collected or processed by the web site. While it is your responsibility to come up with the schedule of how long you keep each dataset for and why you keep it, that information does need to be listed here. For example, you may want to say that you keep contact form entries for six months, analytics records for a year, and customer purchase records for ten years.' ) . '</p>';
</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"> '<p>' . $suggested_text . __( 'If you leave a comment, the comment and its metadata are retained indefinitely. This is so we can recognize and approve any follow-up comments automatically instead of holding them in a moderation queue.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'For users that register on our website (if any), we also store the personal information they provide in their user profile. All users can see, edit, or delete their personal information at any time (except they cannot change their username). Website administrators can also see and edit that information.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1803,7 +1807,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<h2>' . __( 'What rights you have over your data' ) . '</h2>';
</span><span class="cx" style="display: block; padding: 0 10px"> $descr && $content .=
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="privacy-policy-tutorial">' . __( 'In this section you should explain what rights your users have over their data and how they can invoke those rights.' ) . '</p>';
</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"> '<p>' . $suggested_text . __( 'If you have an account on this site, or have left comments, you can request to receive an exported file of the personal data we hold about you, including any data you have provided to us. You can also request that we erase any personal data we hold about you. This does not include any data we are obliged to keep for administrative, legal, or security purposes.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> '<h2>' . __( 'Where we send your data' ) . '</h2>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1810,7 +1814,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $descr && $content .=
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="privacy-policy-tutorial">' . __( 'In this section you should list all transfers of your site data outside the European Union and describe the means by which that data is safeguarded to European data protection standards. This could include your web hosting, cloud storage, or other third party services.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="privacy-policy-tutorial">' . __( 'European data protection law requires data about European residents which is transferred outside the European Union to be safeguarded to the same standards as if the data was in Europe. So in addition to listing where data goes, you should describe how you ensure that these standards are met either by yourself or by your third party providers, whether that is through an agreement such as Privacy Shield, model clauses in your contracts, or binding corporate rules.' ) . '</p>';
</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"> '<p>' . $suggested_text . __( 'Visitor comments may be checked through an automated spam detection service.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> '<h2>' . __( 'Your contact information' ) . '</h2>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1817,32 +1821,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $descr && $content .=
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="privacy-policy-tutorial">' . __( 'In this section you should provide a contact method for privacy-specific concerns. If you are required to have a Data Protection Officer, list their name and full contact details here as well.' ) . '</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">- $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"> '<h2>' . __( 'Additional information' ) . '</h2>';
</span><span class="cx" style="display: block; padding: 0 10px"> $descr && $content .=
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="privacy-policy-tutorial">' . __( 'If you use your site for commercial purposes and you engage in more complex collection or processing of personal data, you should note the following information in your privacy policy in addition to the information we have already discussed.' ) . '</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">- $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"> '<h3>' . __( 'How we protect your data' ) . '</h3>';
</span><span class="cx" style="display: block; padding: 0 10px"> $descr && $content .=
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="privacy-policy-tutorial">' . __( 'In this section you should explain what measures you have taken to protect your users’ data. This could include technical measures such as encryption; security measures such as two factor authentication; and measures such as staff training in data protection. If you have carried out a Privacy Impact Assessment, you can mention it here too.' ) . '</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">- $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"> '<h3>' . __( 'What data breach procedures we have in place' ) . '</h3>';
</span><span class="cx" style="display: block; padding: 0 10px"> $descr && $content .=
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="privacy-policy-tutorial">' . __( 'In this section you should explain what procedures you have in place to deal with data breaches, either potential or real, such as internal reporting systems, contact mechanisms, or bug bounties.' ) . '</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">- $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"> '<h3>' . __( 'What third parties we receive data from' ) . '</h3>';
</span><span class="cx" style="display: block; padding: 0 10px"> $descr && $content .=
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="privacy-policy-tutorial">' . __( 'If your web site receives data about users from third parties, including advertisers, this information must be included within the section of your privacy policy dealing with third party data.' ) . '</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">- $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"> '<h3>' . __( 'What automated decision making and/or profiling we do with user data' ) . '</h3>';
</span><span class="cx" style="display: block; padding: 0 10px"> $descr && $content .=
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="privacy-policy-tutorial">' . __( 'If your web site provides a service which includes automated decision making - for example, allowing customers to apply for credit, or aggregating their data into an advertising profile - you must note that this is taking place, and include information about how that information is used, what decisions are made with that aggregated data, and what rights users have over decisions made without human intervention.' ) . '</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">- $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"> '<h3>' . __( 'Industry regulatory disclosure requirements' ) . '</h3>';
</span><span class="cx" style="display: block; padding: 0 10px"> $descr && $content .=
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="privacy-policy-tutorial">' . __( 'If you are a member of a regulated industry, or if you are subject to additional privacy laws, you may be required to disclose that information here.' ) . '</p>' .
</span></span></pre></div>
<a id="trunksrcwpadminincludesmsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ms.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/ms.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -961,11 +961,11 @@
</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 _thickbox_path_admin_subfolder() {
</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"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> var tb_pathToImage = "<?php echo includes_url( 'js/thickbox/loadingAnimation.gif', 'relative' ); ?>";
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</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
</ins><span class="cx" style="display: block; 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">@@ -1065,7 +1065,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td><fieldset><p><legend><?php _e( 'User has no sites or content and will be deleted.' ); ?></legend></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -1076,7 +1076,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'delete_user_form', $current_user, $allusers );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 1 == count( $users ) ) :
</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"> <p><?php _e( 'Once you hit “Confirm Deletion”, the user will be permanently removed.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Once you hit “Confirm Deletion”, these users will be permanently removed.' ); ?></p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1084,7 +1084,7 @@
</span><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"> submit_button( __( 'Confirm Deletion' ), 'primary' );
</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"> </form>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1096,7 +1096,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function network_settings_add_js() {
</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"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> jQuery(document).ready( function($) {
</span><span class="cx" style="display: block; padding: 0 10px"> var languageSelect = $( '#WPLANG' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1109,7 +1109,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</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
</ins><span class="cx" style="display: block; 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">@@ -1147,7 +1147,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"> $links = apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'network_edit_site_nav_links', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'network_edit_site_nav_links',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'site-info' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Info' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => 'site-info.php',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1173,7 +1174,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Parse arguments
</span><span class="cx" style="display: block; padding: 0 10px"> $r = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'blog_id' => isset( $_GET['blog_id'] ) ? (int) $_GET['blog_id'] : 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'links' => $links,
</span><span class="cx" style="display: block; padding: 0 10px"> 'selected' => 'site-info',
</span></span></pre></div>
<a id="trunksrcwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/nav-menu.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/nav-menu.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,7 +105,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'taxonomy' == $matches[1] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $matches[2], array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $matches[2],
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name__like' => $query,
</span><span class="cx" style="display: block; padding: 0 10px"> 'number' => 10,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +150,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === get_user_option( 'managenav-menuscolumnshidden' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user = wp_get_current_user();
</span><span class="cx" style="display: block; padding: 0 10px"> update_user_option(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user->ID, 'managenav-menuscolumnshidden',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user->ID,
+ 'managenav-menuscolumnshidden',
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 0 => 'link-target',
</span><span class="cx" style="display: block; padding: 0 10px"> 1 => 'css-classes',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -439,7 +441,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <ul id="<?php echo $post_type_name; ?>checklist-most-recent" class="categorychecklist form-no-clear">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $recent_args = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'post_date',
</span><span class="cx" style="display: block; padding: 0 10px"> 'order' => 'DESC',
</span><span class="cx" style="display: block; padding: 0 10px"> 'posts_per_page' => 15,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -530,7 +533,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval( $_nav_menu_placeholder ) - 1 : -1;
</span><span class="cx" style="display: block; padding: 0 10px"> array_unshift(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts, (object) array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts,
+ (object) array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'front_or_home' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'ID' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object_id' => $_nav_menu_placeholder,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -551,7 +555,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post_type->has_archive ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval( $_nav_menu_placeholder ) - 1 : -1;
</span><span class="cx" style="display: block; padding: 0 10px"> array_unshift(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts, (object) array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts,
+ (object) array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'ID' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object_id' => $_nav_menu_placeholder,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => $post_type_name,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -677,8 +682,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $num_pages = ceil(
</span><span class="cx" style="display: block; padding: 0 10px"> wp_count_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy_name, array_merge(
- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $taxonomy_name,
+ array_merge(
+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'number' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'offset' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -763,7 +770,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <ul id="<?php echo $taxonomy_name; ?>checklist-pop" class="categorychecklist form-no-clear" >
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $popular_terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy_name, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $taxonomy_name,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'count',
</span><span class="cx" style="display: block; padding: 0 10px"> 'order' => 'DESC',
</span><span class="cx" style="display: block; padding: 0 10px"> 'number' => 10,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -800,7 +808,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $searched = esc_attr( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] );
</span><span class="cx" style="display: block; padding: 0 10px"> $search_results = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy_name, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $taxonomy_name,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name__like' => $searched,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'all',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'count',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1096,7 +1105,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selected_title ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $unsorted_menu_items = wp_get_nav_menu_items(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $nav_menu_selected_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nav_menu_selected_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'ID',
</span><span class="cx" style="display: block; padding: 0 10px"> 'output' => ARRAY_A,
</span><span class="cx" style="display: block; padding: 0 10px"> 'output_key' => 'ID',
</span></span></pre></div>
<a id="trunksrcwpadminincludesnetworkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/network.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/network.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/network.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( allow_subdomain_install() && allow_subdirectory_install() ) :
</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"> <h3><?php esc_html_e( 'Addresses of Sites in your Network' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories.' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <strong><?php _e( 'You cannot change this later.' ); ?></strong></p>
</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"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> </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">-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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"> if ( WP_CONTENT_DIR != ABSPATH . 'wp-content' && ( allow_subdirectory_install() || ! allow_subdomain_install() ) ) {
</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"> __( 'The internet address of your network will be %s.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . $hostname . '</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -411,15 +411,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $subdomain_install = is_subdomain_install();
</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"> <p><?php _e( 'The original configuration steps are shown here for reference.' ); ?></p>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $subdomain_install = (bool) $wpdb->get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = 1 AND meta_key = 'subdomain_install'" );
</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"> <div class="error"><p><strong><?php _e( 'Warning:' ); ?></strong> <?php _e( 'An existing WordPress network was detected.' ); ?></p></div>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Please complete the configuration steps. To create a new network, you will need to empty or remove the network database tables.' ); ?></p>
</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
</ins><span class="cx" style="display: block; 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">@@ -428,7 +428,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $subdir_replacement_12 = $subdomain_install ? '$1' : '$2';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $_POST || ! is_multisite() ) {
</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"> <h3><?php esc_html_e( 'Enabling the Network' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Complete the following steps to enable the features for creating a network of sites.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="updated inline"><p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -459,9 +459,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"> </p></div>
</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
</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">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <ol>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</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"> define('SITE_ID_CURRENT_SITE', 1);
</span><span class="cx" style="display: block; padding: 0 10px"> define('BLOG_ID_CURRENT_SITE', 1);
</span><span class="cx" style="display: block; padding: 0 10px"> </textarea>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> $keys_salts = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'AUTH_KEY' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'SECURE_AUTH_KEY' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -498,58 +498,58 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'LOGGED_IN_SALT' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'NONCE_SALT' => '',
</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 ( $keys_salts as $c => $v ) {
- if ( defined( $c ) ) {
- unset( $keys_salts[ $c ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $keys_salts as $c => $v ) {
+ if ( defined( $c ) ) {
+ unset( $keys_salts[ $c ] );
+ }
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! empty( $keys_salts ) ) {
- $keys_salts_str = '';
- $from_api = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
- if ( is_wp_error( $from_api ) ) {
- foreach ( $keys_salts as $c => $v ) {
- $keys_salts_str .= "\ndefine( '$c', '" . wp_generate_password( 64, true, true ) . "' );";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $keys_salts ) ) {
+ $keys_salts_str = '';
+ $from_api = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
+ if ( is_wp_error( $from_api ) ) {
+ foreach ( $keys_salts as $c => $v ) {
+ $keys_salts_str .= "\ndefine( '$c', '" . wp_generate_password( 64, true, true ) . "' );";
+ }
+ } else {
+ $from_api = explode( "\n", wp_remote_retrieve_body( $from_api ) );
+ foreach ( $keys_salts as $c => $v ) {
+ $keys_salts_str .= "\ndefine( '$c', '" . substr( array_shift( $from_api ), 28, 64 ) . "' );";
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
- $from_api = explode( "\n", wp_remote_retrieve_body( $from_api ) );
- foreach ( $keys_salts as $c => $v ) {
- $keys_salts_str .= "\ndefine( '$c', '" . substr( array_shift( $from_api ), 28, 64 ) . "' );";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $num_keys_salts = count( $keys_salts );
+ ?>
+<p>
+ <?php
+ if ( 1 == $num_keys_salts ) {
+ printf(
+ /* translators: %s: wp-config.php */
+ __( 'This unique authentication key is also missing from your %s file.' ),
+ '<code>wp-config.php</code>'
+ );
+ } else {
+ printf(
+ /* translators: %s: wp-config.php */
+ __( 'These unique authentication keys are also missing from your %s file.' ),
+ '<code>wp-config.php</code>'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
- $num_keys_salts = count( $keys_salts );
-?>
-<p>
- <?php
- if ( 1 == $num_keys_salts ) {
- printf(
- /* translators: %s: wp-config.php */
- __( 'This unique authentication key is also missing from your %s file.' ),
- '<code>wp-config.php</code>'
- );
- } else {
- printf(
- /* translators: %s: wp-config.php */
- __( 'These unique authentication keys are also missing from your %s file.' ),
- '<code>wp-config.php</code>'
- );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'To make your installation more secure, you should also add:' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea class="code" readonly="readonly" cols="100" rows="<?php echo $num_keys_salts; ?>"><?php echo esc_textarea( $keys_salts_str ); ?></textarea>
</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
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-if ( iis7_supports_permalinks() ) :
- // IIS doesn't support RewriteBase, all your RewriteBase are belong to us
- $iis_subdir_match = ltrim( $base, '/' ) . $subdir_match;
- $iis_rewrite_base = ltrim( $base, '/' ) . $rewrite_base;
- $iis_subdir_replacement = $subdomain_install ? '' : '{R:1}';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( iis7_supports_permalinks() ) :
+ // IIS doesn't support RewriteBase, all your RewriteBase are belong to us
+ $iis_subdir_match = ltrim( $base, '/' ) . $subdir_match;
+ $iis_rewrite_base = ltrim( $base, '/' ) . $rewrite_base;
+ $iis_subdir_replacement = $subdomain_install ? '' : '{R:1}';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $web_config_file = '<?xml version="1.0" encoding="UTF-8"?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $web_config_file = '<?xml version="1.0" encoding="UTF-8"?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <configuration>
</span><span class="cx" style="display: block; padding: 0 10px"> <system.webServer>
</span><span class="cx" style="display: block; padding: 0 10px"> <rewrite>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -558,13 +558,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <match url="^index\.php$" ignoreCase="false" />
</span><span class="cx" style="display: block; padding: 0 10px"> <action type="None" />
</span><span class="cx" style="display: block; padding: 0 10px"> </rule>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
- $web_config_file .= '
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
+ $web_config_file .= '
</ins><span class="cx" style="display: block; padding: 0 10px"> <rule name="WordPress Rule for Files" stopProcessing="true">
</span><span class="cx" style="display: block; padding: 0 10px"> <match url="^' . $iis_subdir_match . 'files/(.+)" ignoreCase="false" />
</span><span class="cx" style="display: block; padding: 0 10px"> <action type="Rewrite" url="' . $iis_rewrite_base . WPINC . '/ms-files.php?file={R:1}" appendQueryString="false" />
</span><span class="cx" style="display: block; padding: 0 10px"> </rule>';
</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"> $web_config_file .= '
</span><span class="cx" style="display: block; padding: 0 10px"> <rule name="WordPress Rule 2" stopProcessing="true">
</span><span class="cx" style="display: block; padding: 0 10px"> <match url="^' . $iis_subdir_match . 'wp-admin$" ignoreCase="false" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -603,16 +603,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>web.config</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . $home_path . '</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">- echo '</p>';
- if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' ) {
- echo '<p><strong>' . __( 'Warning:' ) . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '</p>';
+ if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' ) {
+ echo '<p><strong>' . __( 'Warning:' ) . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <textarea class="code" readonly="readonly" cols="100" rows="20"><?php echo esc_textarea( $web_config_file ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </textarea></li>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> else : // end iis7_supports_permalinks(). construct an htaccess file instead:
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $ms_files_rewriting = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -651,15 +651,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"> <textarea class="code" readonly="readonly" cols="100" rows="<?php echo substr_count( $htaccess_file, "\n" ) + 1; ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php echo esc_textarea( $htaccess_file ); ?></textarea></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo esc_textarea( $htaccess_file ); ?></textarea></li>
</ins><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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> endif; // end IIS/Apache code branches.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Once you complete these steps, your network is enabled and configured. You will have to log in again.' ); ?> <a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log In' ); ?></a></p>
</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
</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="trunksrcwpadminincludesoptionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/options.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/options.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/options.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> * @since 4.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function options_discussion_add_js() {
</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"> <script>
</span><span class="cx" style="display: block; padding: 0 10px"> (function($){
</span><span class="cx" style="display: block; padding: 0 10px"> var parent = $( '#show_avatars' ),
</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"> })(jQuery);
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</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
</ins><span class="cx" style="display: block; 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">@@ -32,7 +32,7 @@
</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="cx" style="display: block; padding: 0 10px"> function options_general_add_js() {
</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"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> jQuery(document).ready(function($){
</span><span class="cx" style="display: block; padding: 0 10px"> var $siteName = $( '#wp-admin-bar-site-name' ).children( 'a' ).first(),
</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"> </script>
</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
</ins><span class="cx" style="display: block; 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">@@ -97,7 +97,7 @@
</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="cx" style="display: block; padding: 0 10px"> function options_reading_add_js() {
</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"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> jQuery(document).ready(function($){
</span><span class="cx" style="display: block; padding: 0 10px"> var section = $('#front-static-pages'),
</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"> section.find('input:radio').change(check_disabled);
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</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
</ins><span class="cx" style="display: block; 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="trunksrcwpadminincludesplugininstallphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/plugin-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin-install.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/plugin-install.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,7 +288,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tags[ $tag['name'] ] = (object) $data;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo wp_generate_tag_cloud(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tags, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tags,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'single_text' => __( '%s plugin' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'multiple_text' => __( '%s plugins' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function install_plugins_upload() {
</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"> <div class="upload-plugin">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="install-help"><?php _e( 'If you have a plugin in a .zip format, you may install it by uploading it here.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo self_admin_url( 'update.php?action=upload-plugin' ); ?>">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -341,7 +342,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button( __( 'Install Now' ), '', 'install-plugin-submit', false ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -501,8 +502,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"> $api = plugins_api(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'plugin_information', array(
- 'slug' => wp_unslash( $_REQUEST['plugin'] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'plugin_information',
+ array(
+ 'slug' => wp_unslash( $_REQUEST['plugin'] ),
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -690,13 +692,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'number' => $api->num_ratings,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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"> <p aria-hidden="true" class="fyi-description"><?php printf( _n( '(based on %s rating)', '(based on %s ratings)', $api->num_ratings ), number_format_i18n( $api->num_ratings ) ); ?></p>
</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
</ins><span class="cx" style="display: 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( $api->ratings ) && array_sum( (array) $api->ratings ) > 0 ) {
</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"> <h3><?php _e( 'Reviews' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="fyi-description"><?php _e( 'Read all reviews on WordPress.org or write your own!' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -726,7 +728,7 @@
</span><span class="cx" style="display: 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( $api->contributors ) ) {
</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"> <h3><?php _e( 'Contributors' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul class="contributors">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -738,7 +740,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $contrib_name = esc_html( $contrib_name );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $contrib_profile = esc_url( $contrib_details['profile'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $contrib_avatar = esc_url( add_query_arg( 's', '36', $contrib_details['avatar'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $contrib_avatar = esc_url( add_query_arg( 's', '36', $contrib_details['avatar'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo "<li><a href='{$contrib_profile}' target='_blank'><img src='{$contrib_avatar}' width='18' height='18' alt='' />{$contrib_name}</a></li>";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/post.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/post.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -239,7 +239,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( post_type_supports( $ptype->name, 'revisions' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $revisions = wp_get_post_revisions(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_ID, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_ID,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'order' => 'ASC',
</span><span class="cx" style="display: block; padding: 0 10px"> 'posts_per_page' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -955,8 +956,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->prepare(
</span><span class="cx" style="display: block; padding: 0 10px"> "SELECT meta_key, meta_value, meta_id, post_id
</span><span class="cx" style="display: block; padding: 0 10px"> FROM $wpdb->postmeta WHERE post_id = %d
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ORDER BY meta_key,meta_id", $postid
- ), ARRAY_A
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ORDER BY meta_key,meta_id",
+ $postid
+ ),
+ ARRAY_A
</ins><span class="cx" style="display: block; 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">@@ -1701,7 +1704,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <a class="button" href="<?php echo esc_url( $sendback ); ?>"><?php echo $sendback_text; ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $preview_link ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <a class="button<?php echo $tab_last; ?>" href="<?php echo esc_url( $preview_link ); ?>"><?php _e( 'Preview' ); ?></a>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Allow plugins to prevent some users overriding the post lock
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1711,7 +1714,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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -2002,7 +2005,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"> $_term = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => $term,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/revision.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> if ( ! $diff && 'post_title' === $field ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // It's a better user experience to still show the Title, even if it didn't change.
</span><span class="cx" style="display: block; padding: 0 10px"> // No, you didn't see this.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $diff = '<table class="diff"><colgroup><col class="content diffsplit left"><col class="content diffsplit middle"><col class="content diffsplit right"></colgroup><tbody><tr>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $diff = '<table class="diff"><colgroup><col class="content diffsplit left"><col class="content diffsplit middle"><col class="content diffsplit right"></colgroup><tbody><tr>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // In split screen mode, show the title before/after side by side.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( true === $args['show_split_view'] ) {
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $diff .= '</tr></tbody>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $diff .= '</tr></tbody>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $diff .= '</table>';
</span><span class="cx" style="display: block; padding: 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,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $now_gmt = time();
</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(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post->ID, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post->ID,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'order' => 'ASC',
</span><span class="cx" style="display: block; padding: 0 10px"> 'check_enabled' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,7 +195,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $modified_gmt = strtotime( $revision->post_modified_gmt . ' +0000' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $can_restore ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $restore_link = str_replace(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '&', '&', wp_nonce_url(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '&',
+ '&',
+ wp_nonce_url(
</ins><span class="cx" style="display: block; padding: 0 10px"> add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'revision' => $revision->ID,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,7 +397,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Autosave by %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<span class="author-name">{{ data.attributes.author.name }}</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">- ?>
</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><span class="cx" style="display: block; padding: 0 10px"> <# } else if ( data.attributes.current ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="byline">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -403,7 +406,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Current Revision by %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<span class="author-name">{{ data.attributes.author.name }}</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">- ?>
</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><span class="cx" style="display: block; padding: 0 10px"> <# } else { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="byline">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -412,7 +415,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Revision by %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<span class="author-name">{{ data.attributes.author.name }}</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">- ?>
</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><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="time-ago">{{ data.attributes.timeAgo }}</span>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/schema.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1027,7 +1027,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 1 == $network_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->site, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->site,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'domain' => $domain,
</span><span class="cx" style="display: block; padding: 0 10px"> 'path' => $path,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1035,7 +1036,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $network_id = $wpdb->insert_id;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->site, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->site,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'domain' => $domain,
</span><span class="cx" style="display: block; padding: 0 10px"> 'path' => $path,
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $network_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1082,7 +1084,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> --The Team @ 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">- $misc_exts = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $misc_exts = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> // Images.
</span><span class="cx" style="display: block; padding: 0 10px"> 'jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'jpeg',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1179,7 +1181,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $current_site->path = $path;
</span><span class="cx" style="display: block; padding: 0 10px"> $current_site->site_name = ucfirst( $domain );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->blogs, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->blogs,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'site_id' => $network_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'blog_id' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'domain' => $domain,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1207,7 +1210,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $errstr = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $hostname = substr( md5( time() ), 0, 6 ) . '.' . $domain; // Very random hostname!
</span><span class="cx" style="display: block; padding: 0 10px"> $page = wp_remote_get(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'http://' . $hostname, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'http://' . $hostname,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'timeout' => 5,
</span><span class="cx" style="display: block; padding: 0 10px"> 'httpversion' => '1.1',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/template.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_category_checklist( $post_id = 0, $descendants_and_self = 0, $selected_cats = false, $popular_cats = false, $walker = null, $checked_ontop = true ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_terms_checklist(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'descendants_and_self' => $descendants_and_self,
</span><span class="cx" style="display: block; padding: 0 10px"> 'selected_cats' => $selected_cats,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +129,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['popular_cats'] = $r['popular_cats'];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['popular_cats'] = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'count',
</span><span class="cx" style="display: block; padding: 0 10px"> 'order' => 'DESC',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +141,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $descendants_and_self ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $categories = (array) get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'child_of' => $descendants_and_self,
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,7 +207,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'count',
</span><span class="cx" style="display: block; padding: 0 10px"> 'order' => 'DESC',
</span><span class="cx" style="display: block; padding: 0 10px"> 'number' => $number,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,7 +266,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"> $categories = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'link_category', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'link_category',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'name',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -404,7 +409,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args An array of default args.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $content = apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp_comment_reply', '', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp_comment_reply',
+ '',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'position' => $position,
</span><span class="cx" style="display: block; padding: 0 10px"> 'checkbox' => $checkbox,
</span><span class="cx" style="display: block; padding: 0 10px"> 'mode' => $mode,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -424,9 +431,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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <form method="get">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( $table_row ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $table_row ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <table style="display:none;"><tbody id="com-reply"><tr id="replyrow" class="inline-edit-row" style="display:none;"><td colspan="<?php echo $wp_list_table->get_column_count(); ?>" class="colspanchange">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="com-reply" style="display:none;"><div id="replyrow" style="display:none;">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -443,7 +450,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_editor(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '', 'replycontent', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '',
+ 'replycontent',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'media_buttons' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'tinymce' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'quicktags' => $quicktags_settings,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -499,13 +508,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"> </fieldset>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( $table_row ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $table_row ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td></tr></tbody></table>
</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"> </div></div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endif; ?>
</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"> </form>
</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
</ins><span class="cx" style="display: block; 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">@@ -514,7 +523,7 @@
</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="cx" style="display: block; padding: 0 10px"> function wp_comment_trashnotice() {
</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"> <div class="hidden" id="trash-undo-holder">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="trash-undo-inside"><?php printf( __( 'Comment by %s moved to the trash.' ), '<strong></strong>' ); ?> <span class="undo untrash"><a href="#"><?php _e( 'Undo' ); ?></a></span></div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -521,7 +530,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="hidden" id="spam-undo-holder">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="spam-undo-inside"><?php printf( __( 'Comment by %s marked as spam.' ), '<strong></strong>' ); ?> <span class="undo unspam"><a href="#"><?php _e( 'Undo' ); ?></a></span></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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -549,7 +558,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"> $count = 0;
</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"> <table id="list-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <thead>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -558,14 +567,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> </thead>
</span><span class="cx" style="display: block; padding: 0 10px"> <tbody id='the-list' data-wp-lists='list:meta'>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-foreach ( $meta as $entry ) {
- echo _list_meta_row( $entry, $count );
-}
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ foreach ( $meta as $entry ) {
+ echo _list_meta_row( $entry, $count );
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tbody>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</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
</ins><span class="cx" style="display: block; 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">@@ -676,7 +685,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_key_input_id = 'metakeyinput';
</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"> <p><strong><?php _e( 'Add New Custom Field:' ); ?></strong></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <table id="newmeta">
</span><span class="cx" style="display: block; padding: 0 10px"> <thead>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -689,18 +698,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tbody>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <td id="newmetaleft" class="left">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( $keys ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $keys ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <select id="metakeyselect" name="metakeyselect">
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="#NONE#"><?php _e( '— Select —' ); ?></option>
</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
</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 ( $keys as $key ) {
- if ( is_protected_meta( $key, 'post' ) || ! current_user_can( 'add_post_meta', $post->ID, $key ) ) {
- continue;
- }
- echo "\n<option value='" . esc_attr( $key ) . "'>" . esc_html( $key ) . '</option>';
-}
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $keys as $key ) {
+ if ( is_protected_meta( $key, 'post' ) || ! current_user_can( 'add_post_meta', $post->ID, $key ) ) {
+ continue;
+ }
+ echo "\n<option value='" . esc_attr( $key ) . "'>" . esc_html( $key ) . '</option>';
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="cx" style="display: block; padding: 0 10px"> <input class="hide-if-js" type="text" id="metakeyinput" name="metakeyinput" value="" />
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="#postcustomstuff" class="hide-if-no-js" onclick="jQuery('#metakeyinput, #metakeyselect, #enternew, #cancelnew').toggle();return false;">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -715,20 +724,24 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr><td colspan="2">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="submit">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-submit_button(
- __( 'Add Custom Field' ), '', 'addmeta', false, array(
- 'id' => 'newmeta-submit',
- 'data-wp-lists' => 'add:the-list:newmeta',
- )
-);
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ submit_button(
+ __( 'Add Custom Field' ),
+ '',
+ 'addmeta',
+ false,
+ array(
+ 'id' => 'newmeta-submit',
+ 'data-wp-lists' => 'add:the-list:newmeta',
+ )
+ );
+ ?>
</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 wp_nonce_field( 'add-meta', '_ajax_nonce-add-meta', false ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( 'add-meta', '_ajax_nonce-add-meta', false ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td></tr>
</span><span class="cx" style="display: block; padding: 0 10px"> </tbody>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</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
</ins><span class="cx" style="display: block; 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">@@ -817,13 +830,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $cur_timeunit = 'cur_' . $timeunit;
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<input type="hidden" id="' . $cur_timeunit . '" name="' . $cur_timeunit . '" value="' . $curr . '" />' . "\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">-?>
</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"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="#edit_timestamp" class="save-timestamp hide-if-no-js button"><?php _e( 'OK' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="#edit_timestamp" class="cancel-timestamp hide-if-no-js button-cancel"><?php _e( 'Cancel' ); ?></a>
</span><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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -934,7 +947,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><strong><?php echo $upload_dir['error']; ?></strong></p></div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> else :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <form enctype="multipart/form-data" id="import-upload-form" method="post" class="wp-upload-form" action="<?php echo esc_url( wp_nonce_url( $action, 'import-upload' ) ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="upload"><?php _e( 'Choose a file from your computer:' ); ?></label> (<?php printf( __( 'Maximum size: %s' ), $size ); ?>)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -942,9 +955,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="action" value="save" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="max_file_size" value="<?php echo $bytes; ?>" />
</span><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 submit_button( __( 'Upload file and import' ), 'primary' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( __( 'Upload file and import' ), 'primary' ); ?>
</ins><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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1243,7 +1256,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $page = $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">- $hidden = get_hidden_meta_boxes( $screen );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $hidden = get_hidden_meta_boxes( $screen );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="side-sortables" class="accordion-container">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul class="outer-border">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1317,7 +1330,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'misc' == $page ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __FUNCTION__, '3.0.0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __FUNCTION__,
+ '3.0.0',
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: misc */
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The "%s" options group has been removed. Use another settings group.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1329,7 +1343,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'privacy' == $page ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __FUNCTION__, '3.5.0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __FUNCTION__,
+ '3.5.0',
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: privacy */
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The "%s" options group has been removed. Use another settings group.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1386,7 +1401,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'misc' == $page ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __FUNCTION__, '3.0.0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __FUNCTION__,
+ '3.0.0',
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: misc */
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The "%s" options group has been removed. Use another settings group.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1398,7 +1414,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'privacy' == $page ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __FUNCTION__, '3.5.0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __FUNCTION__,
+ '3.5.0',
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: privacy */
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The "%s" options group has been removed. Use another settings group.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1650,7 +1667,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $found_action
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function find_posts_div( $found_action = '' ) {
</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"> <div id="find-posts" class="find-box" style="display: none;">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="find-posts-head" class="find-box-head">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Attach to existing content' ); ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1676,7 +1693,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="clear"></div>
</span><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">-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -1745,11 +1762,11 @@
</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"> _wp_admin_html_begin();
</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"> <title><?php bloginfo( 'name' ); ?> › <?php echo $title; ?> — <?php _e( 'WordPress' ); ?></title>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-wp_enqueue_style( 'colors' );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ wp_enqueue_style( 'colors' );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
</span><span class="cx" style="display: block; padding: 0 10px"> function tb_close(){var win=window.dialogArguments||opener||parent||top;win.tb_remove();}
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1761,50 +1778,50 @@
</span><span class="cx" style="display: block; padding: 0 10px"> decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
</span><span class="cx" style="display: block; padding: 0 10px"> isRtl = <?php echo (int) is_rtl(); ?>;
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/** This action is documented in wp-admin/admin-header.php */
-do_action( 'admin_enqueue_scripts', $hook_suffix );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /** This action is documented in wp-admin/admin-header.php */
+ do_action( 'admin_enqueue_scripts', $hook_suffix );
</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/admin-header.php */
-do_action( "admin_print_styles-$hook_suffix" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** This action is documented in wp-admin/admin-header.php */
+ do_action( "admin_print_styles-$hook_suffix" );
</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/admin-header.php */
-do_action( 'admin_print_styles' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** This action is documented in wp-admin/admin-header.php */
+ do_action( 'admin_print_styles' );
</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/admin-header.php */
-do_action( "admin_print_scripts-$hook_suffix" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** This action is documented in wp-admin/admin-header.php */
+ do_action( "admin_print_scripts-$hook_suffix" );
</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/admin-header.php */
-do_action( 'admin_print_scripts' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** This action is documented in wp-admin/admin-header.php */
+ do_action( 'admin_print_scripts' );
</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/admin-header.php */
-do_action( "admin_head-$hook_suffix" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** This action is documented in wp-admin/admin-header.php */
+ do_action( "admin_head-$hook_suffix" );
</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/admin-header.php */
-do_action( 'admin_head' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** This action is documented in wp-admin/admin-header.php */
+ do_action( 'admin_head' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
</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_rtl() ) {
- $admin_body_class .= ' rtl';
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_rtl() ) {
+ $admin_body_class .= ' rtl';
+ }
</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">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </head>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/** This filter is documented in wp-admin/admin-header.php */
-$admin_body_classes = apply_filters( 'admin_body_class', '' );
-$admin_body_classes = ltrim( $admin_body_classes . ' ' . $admin_body_class );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /** This filter is documented in wp-admin/admin-header.php */
+ $admin_body_classes = apply_filters( 'admin_body_class', '' );
+ $admin_body_classes = ltrim( $admin_body_classes . ' ' . $admin_body_class );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <body
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * @global string $body_id
- */
-if ( isset( $GLOBALS['body_id'] ) ) {
- echo ' id="' . $GLOBALS['body_id'] . '"';
-}
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * @global string $body_id
+ */
+ if ( isset( $GLOBALS['body_id'] ) ) {
+ echo ' id="' . $GLOBALS['body_id'] . '"';
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> class="wp-admin wp-core-ui no-js iframe <?php echo $admin_body_classes; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> (function(){
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1813,7 +1830,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> document.body.className = c;
</span><span class="cx" style="display: block; padding: 0 10px"> })();
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</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
</ins><span class="cx" style="display: block; 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">@@ -1834,7 +1851,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $hook_suffix;
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="hidden">
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-admin/admin-footer.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'admin_footer', $hook_suffix );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1843,12 +1860,12 @@
</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/admin-footer.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'admin_print_footer_scripts' );
</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"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">if(typeof wpOnload=="function")wpOnload();</script>
</span><span class="cx" style="display: block; padding: 0 10px"> </body>
</span><span class="cx" style="display: block; padding: 0 10px"> </html>
</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
</ins><span class="cx" style="display: block; 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">@@ -2013,7 +2030,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"> function compression_test() {
</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"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> var compressionNonce = <?php echo wp_json_encode( wp_create_nonce( 'update_can_compress_scripts' ) ); ?>;
</span><span class="cx" style="display: block; padding: 0 10px"> var testCompression = {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2063,7 +2080,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px"> testCompression.check();
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</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
</ins><span class="cx" style="display: block; 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">@@ -2173,7 +2190,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> @header( 'X-UA-Compatible: IE=edge' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> <!DOCTYPE html>
</span><span class="cx" style="display: block; padding: 0 10px"> <!--[if IE 8]>
</span><span class="cx" style="display: block; padding: 0 10px"> <html xmlns="http://www.w3.org/1999/xhtml" class="ie8 <?php echo $admin_html_class; ?>"
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2201,7 +2218,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <!--<![endif]-->
</span><span class="cx" style="display: block; padding: 0 10px"> <head>
</span><span class="cx" style="display: block; padding: 0 10px"> <meta http-equiv="Content-Type" content="<?php bloginfo( 'html_type' ); ?>; charset=<?php echo get_option( 'blog_charset' ); ?>" />
</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
</ins><span class="cx" style="display: block; 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="trunksrcwpadminincludesthemeinstallphp"></a>
<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-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/theme-install.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/theme-install.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,19 +104,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="tag" <?php selected( 'tag', $type ); ?>><?php _ex( 'Tag', 'Theme Installer' ); ?></option>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="screen-reader-text" for="s">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- switch ( $type ) {
- case 'term':
- _e( 'Search by keyword' );
- break;
- case 'author':
- _e( 'Search by author' );
- break;
- case 'tag':
- _e( 'Search by tag' );
- break;
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ switch ( $type ) {
+ case 'term':
+ _e( 'Search by keyword' );
+ break;
+ case 'author':
+ _e( 'Search by author' );
+ break;
+ case 'tag':
+ _e( 'Search by tag' );
+ break;
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="screen-reader-text" for="s"><?php _e( 'Search by keyword' ); ?></label>
</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"> <input type="search" name="s" id="s" size="30" value="<?php echo esc_attr( $term ); ?>" autofocus="autofocus" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button( __( 'Search' ), '', 'search', false ); ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -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 install_themes_dashboard() {
</span><span class="cx" style="display: block; padding: 0 10px"> install_theme_search_form( false );
</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"> <h4><?php _e( 'Feature Filter' ); ?></h4>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="install-help"><?php _e( 'Find a theme based on specific features.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,7 +152,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $features as $feature => $feature_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $feature_name = esc_html( $feature_name );
</span><span class="cx" style="display: block; padding: 0 10px"> $feature = esc_attr( $feature );
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="checkbox" name="features[]" id="feature-id-<?php echo $feature; ?>" value="<?php echo $feature; ?>" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,15 +162,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </ol>
</span><span class="cx" style="display: block; padding: 0 10px"> <br class="clear" />
</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
</ins><span class="cx" style="display: block; 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"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <br class="clear" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php submit_button( __( 'Find Themes' ), '', 'search' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( __( 'Find Themes' ), '', 'search' ); ?>
</ins><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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -177,7 +177,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"> function install_themes_upload() {
</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"> <p class="install-help"><?php _e( 'If you have a theme in a .zip format, you may install it by uploading it here.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo self_admin_url( 'update.php?action=upload-theme' ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nonce_field( 'theme-upload' ); ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/theme.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,7 +183,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'TB_iframe' => 'true',
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 1024,
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => 800,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $update['url']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $update['url']
</ins><span class="cx" style="display: block; padding: 0 10px"> ); //Theme browser inside WP? replace this, Also, theme preview JS will override this on the available list.
</span><span class="cx" style="display: block; padding: 0 10px"> $update_url = wp_nonce_url( admin_url( 'update.php?action=upgrade-theme&theme=' . urlencode( $stylesheet ) ), 'upgrade-theme_' . $stylesheet );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/update.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'available' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'dismissed' => false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $options
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $options
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $dismissed = get_site_option( 'dismissed_update_core' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -549,7 +550,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'TB_iframe' => 'true',
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 1024,
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => 800,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $current->response[ $theme_key ]['url']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $current->response[ $theme_key ]['url']
</ins><span class="cx" style="display: 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 WP_MS_Themes_List_Table $wp_list_table */
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/upgrade.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,7 +147,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $cat_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $cat_id == null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->sitecategories, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->sitecategories,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'cat_ID' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'cat_name' => $cat_name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'category_nicename' => $cat_slug,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,7 +163,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"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->terms, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->terms,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'term_id' => $cat_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => $cat_name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => $cat_slug,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,7 +172,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"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->term_taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->term_taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'term_id' => $cat_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,7 +209,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"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->posts, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->posts,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $user_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => $now,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date_gmt' => $now_gmt,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,7 +229,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"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->term_relationships, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->term_relationships,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'term_taxonomy_id' => $cat_tt_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object_id' => 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 +253,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> Commenter avatars come from <a href="https://gravatar.com">Gravatar</a>.'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->comments, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->comments,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_author' => $first_comment_author,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_author_email' => $first_comment_email,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,12 +281,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <blockquote>The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.</blockquote>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to delete this page and create new pages for your content. Have fun!"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), admin_url()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ admin_url()
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $first_post_guid = get_option( 'home' ) . '/?page_id=2';
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->posts, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->posts,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $user_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => $now,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date_gmt' => $now_gmt,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -300,7 +308,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"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->postmeta, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->postmeta,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_id' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_key' => '_wp_page_template',
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_value' => 'default',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,7 +332,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $privacy_policy_guid = get_option( 'home' ) . '/?page_id=3';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->posts, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->posts,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $user_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => $now,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date_gmt' => $now_gmt,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -344,7 +354,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"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->postmeta, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->postmeta,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_id' => 3,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_key' => '_wp_page_template',
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_value' => 'default',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -355,13 +366,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set up default widgets for default theme.
</span><span class="cx" style="display: block; padding: 0 10px"> update_option(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'widget_search', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'widget_search',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 2 => array( 'title' => '' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '_multiwidget' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'widget_recent-posts', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'widget_recent-posts',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 2 => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'number' => 5,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -370,7 +383,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"> update_option(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'widget_recent-comments', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'widget_recent-comments',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 2 => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'number' => 5,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -379,7 +393,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"> update_option(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'widget_archives', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'widget_archives',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 2 => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'count' => 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -389,7 +404,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"> update_option(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'widget_categories', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'widget_categories',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 2 => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'count' => 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -400,13 +416,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"> update_option(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'widget_meta', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'widget_meta',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 2 => array( 'title' => '' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '_multiwidget' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'sidebars_widgets', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'sidebars_widgets',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wp_inactive_widgets' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'sidebar-1' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 0 => 'search-2',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -442,7 +460,8 @@
</span><span class="cx" style="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.
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->usermeta, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->usermeta,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $user_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_key' => $wpdb->base_prefix . '1_capabilities',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -564,7 +583,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> --The WordPress Team
</span><span class="cx" style="display: block; padding: 0 10px"> https://wordpress.org/
</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_url, $name, $password, $login_url
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $blog_url,
+ $name,
+ $password,
+ $login_url
</ins><span class="cx" style="display: 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_mail( $email, __( 'New WordPress Site' ), $message );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -832,7 +855,8 @@
</span><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! $cat && 0 != $post->post_category ) { // If there's no result
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->post2cat, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->post2cat,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_id' => $post->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'category_id' => $post->post_category,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1116,7 +1140,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $objects = $wpdb->get_results( "SELECT ID, post_type FROM $wpdb->posts WHERE post_status = 'object'" );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $objects as $object ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->posts, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->posts,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => $object->post_type,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1234,7 +1259,11 @@
</span><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"> "INSERT INTO $wpdb->terms (term_id, name, slug, term_group) VALUES
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- (%d, %s, %s, %d)", $term_id, $name, $slug, $term_group
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ (%d, %s, %s, %d)",
+ $term_id,
+ $name,
+ $slug,
+ $term_group
</ins><span class="cx" style="display: block; 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">@@ -1288,7 +1317,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"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->term_relationships, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->term_relationships,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'object_id' => $post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'term_taxonomy_id' => $tt_id,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1327,7 +1357,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $default_link_cat = $term_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->term_taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->term_taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'term_id' => $term_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'link_category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1355,7 +1386,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"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->term_relationships, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->term_relationships,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'object_id' => $link->link_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'term_taxonomy_id' => $tt_id,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1376,7 +1408,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->term_relationships, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->term_relationships,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'object_id' => $link_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'term_taxonomy_id' => $tt_id,
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/user.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -537,7 +537,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</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
</ins><span class="cx" style="display: block; 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">@@ -550,12 +550,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $user User data object
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function use_ssl_preference( $user ) {
</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"> <tr class="user-use-ssl-wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Use https' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><label for="use_ssl"><input name="use_ssl" type="checkbox" id="use_ssl" value="1" <?php checked( '1', $user->use_ssl ); ?> /> <?php _e( 'Always use https when visiting the admin' ); ?></label></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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -576,7 +576,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> Please click the following link to activate your user account:
</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">- ), wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ),
+ home_url(),
+ wp_specialchars_decode( translate_user_role( $role['name'] ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -627,10 +630,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $request_id, '_wp_user_request_completed_timestamp', 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">- $request = wp_update_post( array(
- 'ID' => $request_id,
- 'post_status' => 'request-completed',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request = wp_update_post(
+ array(
+ 'ID' => $request_id,
+ 'post_status' => 'request-completed',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $request;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -753,29 +758,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_personal_data_cleanup_requests() {
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/user.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expires = (int) apply_filters( 'user_request_key_expiration', DAY_IN_SECONDS );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expires = (int) apply_filters( 'user_request_key_expiration', DAY_IN_SECONDS );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $requests_query = new WP_Query( array(
- 'post_type' => 'user_request',
- 'posts_per_page' => -1,
- 'post_status' => 'request-pending',
- 'fields' => 'ids',
- 'date_query' => array(
- array(
- 'column' => 'post_modified_gmt',
- 'before' => $expires . ' seconds ago',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $requests_query = new WP_Query(
+ array(
+ 'post_type' => 'user_request',
+ 'posts_per_page' => -1,
+ 'post_status' => 'request-pending',
+ 'fields' => 'ids',
+ 'date_query' => array(
+ array(
+ 'column' => 'post_modified_gmt',
+ 'before' => $expires . ' seconds ago',
+ ),
</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">+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $request_ids = $requests_query->posts;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $request_ids as $request_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_update_post( array(
- 'ID' => $request_id,
- 'post_status' => 'request-failed',
- 'post_password' => '',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_post(
+ array(
+ 'ID' => $request_id,
+ 'post_status' => 'request-failed',
+ 'post_password' => '',
+ )
+ );
</ins><span class="cx" style="display: block; 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">@@ -796,10 +805,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // "Borrow" xfn.js for now so we don't have to create new files.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'xfn' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $requests_table = new WP_Privacy_Data_Export_Requests_Table( array(
- 'plural' => 'privacy_requests',
- 'singular' => 'privacy_request',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $requests_table = new WP_Privacy_Data_Export_Requests_Table(
+ array(
+ 'plural' => 'privacy_requests',
+ 'singular' => 'privacy_request',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $requests_table->process_bulk_action();
</span><span class="cx" style="display: block; padding: 0 10px"> $requests_table->prepare_items();
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -867,10 +878,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // "Borrow" xfn.js for now so we don't have to create new files.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'xfn' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $requests_table = new WP_Privacy_Data_Removal_Requests_Table( array(
- 'plural' => 'privacy_requests',
- 'singular' => 'privacy_request',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $requests_table = new WP_Privacy_Data_Removal_Requests_Table(
+ array(
+ 'plural' => 'privacy_requests',
+ 'singular' => 'privacy_request',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $requests_table->process_bulk_action();
</span><span class="cx" style="display: block; padding: 0 10px"> $requests_table->prepare_items();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1013,7 +1026,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_privacy_requests_screen_options() {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'option' => str_replace( 'tools_page_', '', get_current_screen()->id ) . '_requests_per_page',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'option' => str_replace( 'tools_page_', '', get_current_screen()->id ) . '_requests_per_page',
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> add_screen_option( 'per_page', $args );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1175,9 +1188,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function process_bulk_action() {
</span><span class="cx" style="display: block; padding: 0 10px"> $action = $this->current_action();
</span><span class="cx" style="display: block; padding: 0 10px"> $request_ids = isset( $_REQUEST['request_id'] ) ? wp_parse_id_list( wp_unslash( $_REQUEST['request_id'] ) ) : array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $count = 0;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $count = 0;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $request_ids ) {
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'bulk-privacy_requests' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1502,10 +1515,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> submit_button( __( 'Retry' ), 'secondary', 'privacy_action_email_retry[' . $item->ID . ']', false );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'request-completed':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<a href="' . esc_url( wp_nonce_url( add_query_arg( array(
- 'action' => 'delete',
- 'request_id' => array( $item->ID ),
- ), admin_url( 'tools.php?page=export_personal_data' ) ), 'bulk-privacy_requests' ) ) . '" class="button">' . esc_html__( 'Remove request' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<a href="' . esc_url(
+ wp_nonce_url(
+ add_query_arg(
+ array(
+ 'action' => 'delete',
+ 'request_id' => array( $item->ID ),
+ ),
+ admin_url( 'tools.php?page=export_personal_data' )
+ ),
+ 'bulk-privacy_requests'
+ )
+ ) . '" class="button">' . esc_html__( 'Remove request' ) . '</a>';
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1616,10 +1637,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> submit_button( __( 'Retry' ), 'secondary', 'privacy_action_email_retry[' . $item->ID . ']', false );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'request-completed':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<a href="' . esc_url( wp_nonce_url( add_query_arg( array(
- 'action' => 'delete',
- 'request_id' => array( $item->ID ),
- ), admin_url( 'tools.php?page=remove_personal_data' ) ), 'bulk-privacy_requests' ) ) . '" class="button">' . esc_html__( 'Remove request' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<a href="' . esc_url(
+ wp_nonce_url(
+ add_query_arg(
+ array(
+ 'action' => 'delete',
+ 'request_id' => array( $item->ID ),
+ ),
+ admin_url( 'tools.php?page=remove_personal_data' )
+ ),
+ 'bulk-privacy_requests'
+ )
+ ) . '" class="button">' . esc_html__( 'Remove request' ) . '</a>';
</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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/includes/widgets.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,9 +299,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="widget-description">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php echo ( $widget_description = wp_widget_description( $widget_id ) ) ? "$widget_description\n" : "$widget_title\n"; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo ( $widget_description = wp_widget_description( $widget_id ) ) ? "$widget_description\n" : "$widget_title\n"; ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> echo $sidebar_args['after_widget'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $sidebar_args;
</span></span></pre></div>
<a id="trunksrcwpadminindexphp"></a>
<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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/index.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> wp_load_translations_early();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Die with an error message
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$die = sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$die = sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %1$s: WordPress, %2$s: src, %3$s: build */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'You seem to be running %1$s from the %2$s directory. %1$s needs to be built and run from the %3$s directory before we can get started.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'WordPress',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,4 +46,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://make.wordpress.org/core/handbook/tutorials/installing-wordpress-locally/' )
</span><span class="cx" style="display: block; padding: 0 10px"> ) . '</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">-wp_die( $die, __( 'WordPress › Error' ) );
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+wp_die( $die, __( 'WordPress › Error' ) );
</ins></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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/install.php 2018-08-17 01:50:26 UTC (rev 43571)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> // Sanity check.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false ) {
</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"> <!DOCTYPE html>
</span><span class="cx" style="display: block; padding: 0 10px"> <html xmlns="http://www.w3.org/1999/xhtml">
</span><span class="cx" style="display: block; padding: 0 10px"> <head>
</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"> <p>WordPress requires that your web server is running PHP. Your server does not have PHP installed, or PHP is turned off.</p>
</span><span class="cx" style="display: block; padding: 0 10px"> </body>
</span><span class="cx" style="display: block; padding: 0 10px"> </html>
</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
</ins><span class="cx" style="display: block; 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">@@ -63,7 +63,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $body_classes ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $body_classes = ' ' . $body_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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <!DOCTYPE html>
</span><span class="cx" style="display: block; padding: 0 10px"> <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <head>
</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"> <body class="wp-core-ui<?php echo $body_classes; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></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">-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> } // end display_header()
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_email = isset( $_POST['admin_email'] ) ? trim( wp_unslash( $_POST['admin_email'] ) ) : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_null( $error ) ) {
</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"> <h1><?php _ex( 'Welcome', 'Howdy' ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="message"><?php echo $error; ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,7 +129,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="user_name" type="text" id="user_login" size="25" value="<?php echo esc_attr( sanitize_user( $user_name, true ) ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods, and the @ symbol.' ); ?></p>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</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"> <legend class="screen-reader-text"><span><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site Visibility' ) : _e( 'Search Engine Visibility' ); ?> </span></legend>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( has_action( 'blog_privacy_selector' ) ) {
</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"> <input id="blog-public" type="radio" name="blog_public" value="1" <?php checked( 1, $blog_public ); ?> />
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="blog-public"><?php _e( 'Allow search engines to index this site' ); ?></label><br/>
</span><span class="cx" style="display: block; padding: 0 10px"> <input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked( 0, $blog_public ); ?> />
</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"> /** This action is documented in wp-admin/options-reading.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'blog_privacy_selector' );
</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <label for="blog_public"><input name="blog_public" type="checkbox" id="blog_public" value="0" <?php checked( 0, $blog_public ); ?> />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Discourage search engines from indexing this site' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="description"><?php _e( 'It is up to search engines to honor this request.' ); ?></p>
</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"> <p class="step"><?php submit_button( __( 'Install WordPress' ), 'large', 'Submit', false, array( 'id' => 'submit' ) ); ?></p>
</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><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
</ins><span class="cx" style="display: block; padding: 0 10px"> } // end display_setup_form()
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Let's check to make sure WP isn't already installed.
</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"> $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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <h1><?php _ex( 'Welcome', 'Howdy' ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Welcome to the famous five-minute WordPress installation process! Just fill in the information below and you’ll be on your way to using the most extendable and powerful personal publishing platform in the world.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> <h2><?php _e( 'Information needed' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Please provide the following information. Don’t worry, you can always change these settings later.' ); ?></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">-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> display_setup_form();
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 2:
</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"> if ( $error === false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->show_errors();
</span><span class="cx" style="display: block; padding: 0 10px"> $result = wp_install( $weblog_title, $user_name, $admin_email, $public, '', wp_slash( $admin_password ), $loaded_language );
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1><?php _e( 'Success!' ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -390,9 +390,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th><?php _e( 'Password' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- if ( ! empty( $result['password'] ) && empty( $admin_password_check ) ) :
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( ! empty( $result['password'] ) && empty( $admin_password_check ) ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <code><?php echo esc_html( $result['password'] ); ?></code><br />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php echo $result['password_message']; ?></p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -402,7 +402,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="step"><a href="<?php echo esc_url( wp_login_url() ); ?>" class="button button-large"><?php _e( 'Log In' ); ?></a></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">-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminmaintrepairphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/maint/repair.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/maint/repair.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/maint/repair.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . __( 'WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.' ) . '</p>';
</span><span 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"> <p class="step"><a class="button button-large" href="repair.php?repair=1"><?php _e( 'Repair Database' ); ?></a></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'WordPress can also attempt to optimize the database. This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="step"><a class="button button-large" href="repair.php?repair=2"><?php _e( 'Repair and Optimize Database' ); ?></a></p>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </body>
</span></span></pre></div>
<a id="trunksrcwpadminmediaphp"></a>
<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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/media.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/media.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,18 +113,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo "<div id='message' class='$class'><p>$message</p></div>\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">- ?>
</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"> <div class="wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="wp-heading-inline">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-echo esc_html( $title );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ echo esc_html( $title );
+ ?>
</ins><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 ( current_user_can( 'upload_files' ) ) {
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( current_user_can( 'upload_files' ) ) {
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a href="media-new.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'file' ); ?></a>
</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">@@ -132,39 +132,40 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <form method="post" class="media-upload-form" id="media-single-form">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="submit" style="padding-bottom: 0;">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php submit_button( __( 'Update Media' ), 'primary', 'save', false ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( __( 'Update Media' ), 'primary', 'save', false ); ?>
</ins><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"> <div class="media-single">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="media-item-<?php echo $att_id; ?>" class="media-item">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- echo get_media_item(
- $att_id, array(
- 'toggle' => false,
- 'send' => false,
- 'delete' => false,
- 'show_title' => false,
- 'errors' => ! empty( $errors[ $att_id ] ) ? $errors[ $att_id ] : null,
- )
- );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ echo get_media_item(
+ $att_id,
+ array(
+ 'toggle' => false,
+ 'send' => false,
+ 'delete' => false,
+ 'show_title' => false,
+ 'errors' => ! empty( $errors[ $att_id ] ) ? $errors[ $att_id ] : null,
+ )
+ );
+ ?>
</ins><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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php submit_button( __( 'Update Media' ), 'primary', 'save' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( __( 'Update Media' ), 'primary', 'save' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="post_id" id="post_id" value="<?php echo isset( $post_id ) ? esc_attr( $post_id ) : ''; ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr( $att_id ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="action" value="editattachment" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php wp_original_referer_field( true, 'previous' ); ?>
- <?php wp_nonce_field( 'media-form' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_original_referer_field( true, 'previous' ); ?>
+ <?php wp_nonce_field( 'media-form' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</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">
</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
</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( ABSPATH . 'wp-admin/admin-footer.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require( ABSPATH . 'wp-admin/admin-footer.php' );
</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></pre></div>
<a id="trunksrcwpadminmsdeletesitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/ms-delete-site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/ms-delete-site.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/ms-delete-site.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <p><?php _e( 'Thank you. Please check your email for a link to confirm your action. Your site will not be deleted until this link is clicked.' ); ?></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">-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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"> <p><?php printf( __( 'If you do not want to use your %s site any more, you can delete it using the form below. When you click <strong>Delete My Site Permanently</strong> you will be sent an email with a link in it. Click on this link to delete your site.' ), get_network()->site_name ); ?></p>
</span></span></pre></div>
<a id="trunksrcwpadminmysitesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/my-sites.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/my-sites.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/my-sites.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> _e( 'You must be a member of at least one site to use this page.' );
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</p>';
</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">-?>
</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"> <hr class="wp-header-end">
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/nav-menus.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -611,7 +611,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'autofocus' => $focus ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'return' => urlencode( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), admin_url( 'customize.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ admin_url( 'customize.php' )
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Manage with Live Preview' )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -652,7 +653,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . sprintf( _n( 'Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) ) . '</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">- ?>
</del><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="menu-locations-wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <form method="post" action="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="widefat fixed" id="menu-locations-table">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -692,7 +693,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'edit',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu' => $menu_locations[ $_location ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), admin_url( 'nav-menus.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ admin_url( 'nav-menus.php' )
</ins><span class="cx" style="display: block; 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">@@ -710,7 +712,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'edit',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'use-location' => $_location,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), admin_url( 'nav-menus.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ admin_url( 'nav-menus.php' )
</ins><span class="cx" style="display: block; 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">@@ -729,14 +732,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="menu" id="nav-menu-meta-object-id" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #menu-locations-wrap -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- /**
- * Fires after the menu locations table is displayed.
- *
- * @since 3.6.0
- */
- do_action( 'after_menu_locations_table' );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Fires after the menu locations table is displayed.
+ *
+ * @since 3.6.0
+ */
+ do_action( 'after_menu_locations_table' );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="manage-menus">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $menu_count < 2 ) : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -743,16 +746,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="add-edit-menu-action">
</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">- __( 'Edit your menu below, or <a href="%s">create a new menu</a>. Don’t forget to save your changes!' ), esc_url(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Edit your menu below, or <a href="%s">create a new menu</a>. Don’t forget to save your changes!' ),
+ esc_url(
</ins><span class="cx" style="display: block; padding: 0 10px"> add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'edit',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu' => 0,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), admin_url( 'nav-menus.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ admin_url( 'nav-menus.php' )
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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"> <span class="screen-reader-text"><?php _e( 'Click the Save Menu button to save your changes.' ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </span><!-- /add-edit-menu-action -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -802,16 +807,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="add-new-menu-action">
</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">- __( 'or <a href="%s">create a new menu</a>. Don’t forget to save your changes!' ), esc_url(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'or <a href="%s">create a new menu</a>. Don’t forget to save your changes!' ),
+ esc_url(
</ins><span class="cx" style="display: block; padding: 0 10px"> add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'edit',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu' => 0,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), admin_url( 'nav-menus.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ admin_url( 'nav-menus.php' )
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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"> <span class="screen-reader-text"><?php _e( 'Click the Save Menu button to save your changes.' ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </span><!-- /add-new-menu-action -->
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -819,10 +826,10 @@
</span><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"> $metabox_holder_disabled_class = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) {
- $metabox_holder_disabled_class = ' metabox-holder-disabled';
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) {
+ $metabox_holder_disabled_class = ' metabox-holder-disabled';
+}
+?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- /manage-menus -->
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="nav-menus-frame" class="wp-clearfix">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="menu-settings-column" class="metabox-holder<?php echo $metabox_holder_disabled_class; ?>">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -843,9 +850,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <form id="update-nav-menu" method="post" enctype="multipart/form-data">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $new_screen_class = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $add_new_screen ) {
- $new_screen_class = 'blank-slate';
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $add_new_screen ) {
+ $new_screen_class = 'blank-slate';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e( 'Menu structure' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="menu-edit <?php echo $new_screen_class; ?>">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -859,9 +866,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> $menu_name_val = 'value="' . esc_attr( 'Menu 1' ) . '"';
</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"> <input type="hidden" name="zero-menu-state" value="true" />
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_name_val = 'value="' . esc_attr( $nav_menu_selected_title ) . '"';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -880,23 +887,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-body">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-body-content" class="wp-clearfix">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! $add_new_screen ) : ?>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> $hide_style = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $menu_items ) && 0 == count( $menu_items ) ) {
- $hide_style = 'style="display: none;"';
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $menu_items ) && 0 == count( $menu_items ) ) {
+ $hide_style = 'style="display: none;"';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $starter_copy = ( $one_theme_location_no_menus ) ? __( 'Edit your default menu by adding or removing items. Drag each item into the order you prefer. Click Create Menu to save your changes.' ) : __( 'Drag each item into the order you prefer. Click the arrow on the right of the item to reveal additional configuration options.' );
</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"> <div class="drag-instructions post-body-plain" <?php echo $hide_style; ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php echo $starter_copy; ?></p>
</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 ( isset( $edit_markup ) && ! is_wp_error( $edit_markup ) ) {
- echo $edit_markup;
- } else {
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( isset( $edit_markup ) && ! is_wp_error( $edit_markup ) ) {
+ echo $edit_markup;
+ } else {
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul class="menu" id="menu-to-edit"></ul>
</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 } ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $add_new_screen ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="post-body-plain" id="menu-name-desc"><?php _e( 'Give your menu a name, then click Create Menu.' ); ?></p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -903,14 +910,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( isset( $_GET['use-location'] ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="use-location" value="<?php echo esc_attr( $_GET['use-location'] ); ?>" />
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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"> $no_menus_style = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $one_theme_location_no_menus ) {
- $no_menus_style = 'style="display: none;"';
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( $one_theme_location_no_menus ) {
+ $no_menus_style = 'style="display: none;"';
+}
+?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="menu-settings" <?php echo $no_menus_style; ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php _e( 'Menu Settings' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -973,8 +980,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'delete',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu' => $nav_menu_selected_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), admin_url( 'nav-menus.php' )
- ), 'delete-nav_menu-' . $nav_menu_selected_id
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ admin_url( 'nav-menus.php' )
+ ),
+ 'delete-nav_menu-' . $nav_menu_selected_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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/network/settings.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $new_admin_email = get_site_option( 'new_admin_email' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $new_admin_email && $new_admin_email != get_site_option( 'admin_email' ) ) :
</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"> <div class="updated inline">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</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"> __( '%s KB' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<input name="fileupload_maxk" type="number" min="0" style="width: 100px" id="fileupload_maxk" aria-describedby="fileupload-maxk-desc" value="' . esc_attr( get_site_option( 'fileupload_maxk', 300 ) ) . '" />'
</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"> <p class="screen-reader-text" id="fileupload-maxk-desc">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Size in kilobytes' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span></span></pre></div>
<a id="trunksrcwpadminnetworksiteinfophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/site-info.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-info.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/network/site-info.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +107,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'update' => 'updated',
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'site-info.php'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'site-info.php'
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,15 +156,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // The main site of the network should not be updated on this page.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $is_main_site ) :
</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"> <tr class="form-field">
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Site Address (URL)' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><?php echo esc_url( $parsed_scheme . '://' . $details->domain . $details->path ); ?></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
- // For any other site, the scheme, domain, and path can all be changed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ // For any other site, the scheme, domain, and path can all be changed.
</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field form-required">
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Site Address (URL)' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><input name="blog[url]" type="text" id="url" value="<?php echo $parsed_scheme . '://' . esc_attr( $details->domain ) . esc_attr( $details->path ); ?>" /></td>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/network/site-new.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,7 +173,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'update' => 'added',
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'site-new.php'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'site-new.php'
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -212,13 +213,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">-<p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p>
+<?php
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: asterisk to mark required form fields. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Required fields are marked %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<span class="required">*</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">-?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+?>
+</p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <form method="post" action="<?php echo network_admin_url( 'site-new.php?action=add-site' ); ?>" novalidate="novalidate">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -227,15 +230,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_subdomain_install() ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off" required /><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', get_network()->domain ); ?></span>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> echo get_network()->domain . get_network()->path
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off" required />
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p class="description" id="site-address-desc">' . __( 'Only lowercase letters (a-z), numbers, and hyphens are allowed.' ) . '</p>';
</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"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field form-required">
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/network/site-settings.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'update' => 'updated',
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'site-settings.php'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'site-settings.php'
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,14 +139,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 ( strpos( $option->option_value, "\n" ) !== false ) {
</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"> <tr class="form-field">
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="<?php echo esc_attr( $option->option_name ); ?>"><?php echo ucwords( str_replace( '_', ' ', $option->option_name ) ); ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><textarea class="<?php echo $class; ?>" rows="5" cols="40" name="option[<?php echo esc_attr( $option->option_name ); ?>]" id="<?php echo esc_attr( $option->option_name ); ?>"<?php disabled( $disabled ); ?>><?php echo esc_textarea( $option->option_value ); ?></textarea></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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</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="<?php echo esc_attr( $option->option_name ); ?>"><?php echo esc_html( ucwords( str_replace( '_', ' ', $option->option_name ) ) ); ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $is_main_site && in_array( $option->option_name, array( 'siteurl', 'home' ) ) ) { ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +155,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td><input class="<?php echo $class; ?>" name="option[<?php echo esc_attr( $option->option_name ); ?>]" type="text" id="<?php echo esc_attr( $option->option_name ); ?>" value="<?php echo esc_attr( $option->option_value ); ?>" size="40" <?php disabled( $disabled ); ?> /></td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } // End foreach
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitethemesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/site-themes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-themes.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/network/site-themes.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,7 +151,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $id,
</span><span class="cx" style="display: block; padding: 0 10px"> $action => $n,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $referer
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $referer
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</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="trunksrcwpadminnetworksiteusersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/site-users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-users.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/network/site-users.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,7 +296,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/network/site-users.php */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'promote_users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) ) :
</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"> <h2 id="add-existing-user"><?php _e( 'Add Existing User' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <form action="site-users.php?action=adduser" id="adduser" method="post">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
</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"> * @param bool $bool Whether to show the Add New User form. Default true.
</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' ) && apply_filters( 'show_network_site_users_add_new_form', true ) ) :
</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"> <h2 id="add-new-user"><?php _e( 'Add New User' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <form action="<?php echo network_admin_url( 'site-users.php?action=newuser' ); ?>" id="newuser" method="post">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/network/themes.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,7 +181,8 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $theme, esc_url(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $theme,
+ esc_url(
</ins><span class="cx" style="display: block; padding: 0 10px"> add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'verify-delete' => 1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +189,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'delete-selected',
</span><span class="cx" style="display: block; padding: 0 10px"> 'checked' => $_REQUEST['checked'],
</span><span class="cx" style="display: block; padding: 0 10px"> '_wpnonce' => $_REQUEST['_wpnonce'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), network_admin_url( 'themes.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ network_admin_url( 'themes.php' )
</ins><span class="cx" style="display: block; 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,7 +203,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'deleted' => count( $themes ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'paged' => $paged,
</span><span class="cx" style="display: block; padding: 0 10px"> 's' => $s,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), network_admin_url( 'themes.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ network_admin_url( 'themes.php' )
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</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="trunksrcwpadminnetworkupgradephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/upgrade.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/network/upgrade.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +82,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo "<li>$siteurl</li>";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_get(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $upgrade_url, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $upgrade_url,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'timeout' => 120,
</span><span class="cx" style="display: block; padding: 0 10px"> 'httpversion' => '1.1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sslverify' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,7 +132,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'show':
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_site_option( 'wpmu_upgrade_site' ) != $GLOBALS['wp_db_version'] ) :
</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"> <h2><?php _e( 'Database Update Required' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'WordPress has been updated! Before we send you on your way, we need to individually upgrade the sites in your network.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span></span></pre></div>
<a id="trunksrcwpadminnetworkusernewphp"></a>
<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/user-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/user-new.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/network/user-new.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +66,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'update' => 'added',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $user_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'user-new.php'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'user-new.php'
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,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 ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) {
</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"> <div class="error">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $add_user_errors->get_error_messages() as $message ) {
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/network/users.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,7 +113,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'updated' => 'true',
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => $userfunction,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), wp_get_referer()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ wp_get_referer()
</ins><span class="cx" style="display: 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">@@ -169,7 +170,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'updated' => 'true',
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => $deletefunction,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), network_admin_url( 'users.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ network_admin_url( 'users.php' )
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> exit();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,13 +247,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </p></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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="wp-heading-inline"><?php esc_html_e( 'Users' ); ?></h1>
</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 ( current_user_can( 'create_users' ) ) :
</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"> <a href="<?php echo network_admin_url( 'user-new.php' ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/options-general.php 2018-08-17 01:50:26 UTC (rev 43571)
</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 ( defined( 'WP_HOME' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_home_class = ' disabled';
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="siteurl"><?php _e( 'WordPress Address (URL)' ); ?></label></th>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,15 +90,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="home"><?php _e( 'Site Address (URL)' ); ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><input name="home" type="url" id="home" aria-describedby="home-description" value="<?php form_option( 'home' ); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php echo $wp_home_class; ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( ! defined( 'WP_HOME' ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! defined( 'WP_HOME' ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="description" id="home-description">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
- printf(
- /* translators: %s: Codex URL */
- __( 'Enter the address here if you <a href="%s">want your site home page to be different from your WordPress installation directory</a>.' ),
- __( 'https://codex.wordpress.org/Giving_WordPress_Its_Own_Directory' )
- );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ printf(
+ /* translators: %s: Codex URL */
+ __( 'Enter the address here if you <a href="%s">want your site home page to be different from your WordPress installation directory</a>.' ),
+ __( 'https://codex.wordpress.org/Giving_WordPress_Its_Own_Directory' )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $new_admin_email = get_option( 'new_admin_email' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $new_admin_email && $new_admin_email != get_option( 'admin_email' ) ) :
</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"> <div class="updated inline">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</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"> <th scope="row"><?php _e( 'Membership' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td> <fieldset><legend class="screen-reader-text"><span><?php _e( 'Membership' ); ?></span></legend><label for="users_can_register">
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="users_can_register" type="checkbox" id="users_can_register" value="1" <?php checked( '1', get_option( 'users_can_register' ) ); ?> />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php _e( 'Anyone can register' ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e( 'Anyone can register' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> </fieldset></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $languages = get_available_languages();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -241,7 +241,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<abbr>' . __( 'UTC' ) . '</abbr>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . date_i18n( $timezone_format, false, true ) . '</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">- ?>
</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><span class="cx" style="display: block; padding: 0 10px"> <?php if ( get_option( 'timezone_string' ) || ! empty( $current_offset ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <span id="local-time">
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/options-media.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,10 +96,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $wp_settings
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $GLOBALS['wp_settings']['media']['embeds'] ) ) :
</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"> <h2 class="title"><?php _e( 'Embeds' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php do_settings_fields( 'media', 'embeds' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php do_settings_fields( 'media', 'embeds' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </table>
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,18 +106,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! is_multisite() ) : ?>
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-// If upload_url_path is not the default (empty), and upload_path is not the default ('wp-content/uploads' or empty)
-if ( get_option( 'upload_url_path' ) || ( get_option( 'upload_path' ) != 'wp-content/uploads' && get_option( 'upload_path' ) ) ) :
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ // If upload_url_path is not the default (empty), and upload_path is not the default ('wp-content/uploads' or empty)
+ if ( get_option( 'upload_url_path' ) || ( get_option( 'upload_path' ) != 'wp-content/uploads' && get_option( 'upload_path' ) ) ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="upload_path"><?php _e( 'Store uploads in this folder' ); ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><input name="upload_path" type="text" id="upload_path" value="<?php echo esc_attr( get_option( 'upload_path' ) ); ?>" class="regular-text code" />
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="description">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
- /* translators: %s: wp-content/uploads */
- printf( __( 'Default is %s' ), '<code>wp-content/uploads</code>' );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /* translators: %s: wp-content/uploads */
+ printf( __( 'Default is %s' ), '<code>wp-content/uploads</code>' );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,12 +136,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="uploads_use_yearmonth_folders">
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="uploads_use_yearmonth_folders" type="checkbox" id="uploads_use_yearmonth_folders" value="1"<?php checked( '1', get_option( 'uploads_use_yearmonth_folders' ) ); ?> />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php _e( 'Organize my uploads into month- and year-based folders' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e( 'Organize my uploads into month- and year-based folders' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</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 do_settings_fields( 'media', 'uploads' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php do_settings_fields( 'media', 'uploads' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/options-permalink.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> __( 'WordPress offers you the ability to create a custom URL structure for your permalinks and archives. Custom URL structures can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="%s">number of tags are available</a>, and here are some examples to get you started.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://codex.wordpress.org/Using_Permalinks' )
</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"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -317,39 +317,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! is_multisite() ) { ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-if ( $iis7_permalinks ) :
- if ( isset( $_POST['submit'] ) && $permalink_structure && ! $using_index_permalinks && ! $writable ) :
- if ( file_exists( $home_path . 'web.config' ) ) :
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( $iis7_permalinks ) :
+ if ( isset( $_POST['submit'] ) && $permalink_structure && ! $using_index_permalinks && ! $writable ) :
+ if ( file_exists( $home_path . 'web.config' ) ) :
+ ?>
</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
- printf(
- /* translators: 1: web.config, 2: Codex URL, 3: CTRL + a, 4: element code */
- __( 'If your %1$s file was <a href="%2$s">writable</a>, we could do this automatically, but it isn’t so this is the url rewrite rule you should have in your %1$s file. Click in the field and press %3$s to select all. Then insert this rule inside of the %4$s element in %1$s file.' ),
- '<code>web.config</code>',
- __( 'https://codex.wordpress.org/Changing_File_Permissions' ),
- '<kbd>CTRL + a</kbd>',
- '<code>/<configuration>/<system.webServer>/<rewrite>/<rules></code>'
- );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ printf(
+ /* translators: 1: web.config, 2: Codex URL, 3: CTRL + a, 4: element code */
+ __( 'If your %1$s file was <a href="%2$s">writable</a>, we could do this automatically, but it isn’t so this is the url rewrite rule you should have in your %1$s file. Click in the field and press %3$s to select all. Then insert this rule inside of the %4$s element in %1$s file.' ),
+ '<code>web.config</code>',
+ __( 'https://codex.wordpress.org/Changing_File_Permissions' ),
+ '<kbd>CTRL + a</kbd>',
+ '<code>/<configuration>/<system.webServer>/<rewrite>/<rules></code>'
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <form action="options-permalink.php" method="post">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php wp_nonce_field( 'update-permalink' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( 'update-permalink' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><textarea rows="9" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules() ); ?></textarea></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><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
- printf(
- /* translators: %s: web.config */
- __( 'If you temporarily make your %s file writable for us to generate rewrite rules automatically, do not forget to revert the permissions after rule has been saved.' ),
- '<code>web.config</code>'
- );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ printf(
+ /* translators: %s: web.config */
+ __( 'If you temporarily make your %s file writable for us to generate rewrite rules automatically, do not forget to revert the permissions after rule has been saved.' ),
+ '<code>web.config</code>'
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Codex URL, 2: web.config, 3: CTRL + a */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'If the root directory of your site was <a href="%1$s">writable</a>, we could do this automatically, but it isn’t so this is the url rewrite rule you should have in your %2$s file. Create a new file, called %2$s in the root directory of your site. Click in the field and press %3$s to select all. Then insert this code into the %2$s file.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -357,42 +357,42 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>web.config</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<kbd>CTRL + a</kbd>'
</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"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <form action="options-permalink.php" method="post">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php wp_nonce_field( 'update-permalink' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( 'update-permalink' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><textarea rows="18" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules( true ) ); ?></textarea></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: web.config */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'If you temporarily make your site’s root directory writable for us to generate the %s file automatically, do not forget to revert the permissions after the file has been created.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>web.config</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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</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><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( $is_nginx ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( '<a href="https://codex.wordpress.org/Nginx">Documentation on Nginx configuration</a>.' ); ?></p>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> else :
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $permalink_structure && ! $using_index_permalinks && ! $writable && $update_required ) :
</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"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
- printf(
- /* translators: 1: .htaccess, 2: Codex URL, 3: CTRL + a */
- __( 'If your %1$s file was <a href="%2$s">writable</a>, we could do this automatically, but it isn’t so these are the mod_rewrite rules you should have in your %1$s file. Click in the field and press %3$s to select all.' ),
- '<code>.htaccess</code>',
- __( 'https://codex.wordpress.org/Changing_File_Permissions' ),
- '<kbd>CTRL + a</kbd>'
- );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ printf(
+ /* translators: 1: .htaccess, 2: Codex URL, 3: CTRL + a */
+ __( 'If your %1$s file was <a href="%2$s">writable</a>, we could do this automatically, but it isn’t so these are the mod_rewrite rules you should have in your %1$s file. Click in the field and press %3$s to select all.' ),
+ '<code>.htaccess</code>',
+ __( 'https://codex.wordpress.org/Changing_File_Permissions' ),
+ '<kbd>CTRL + a</kbd>'
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <form action="options-permalink.php" method="post">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php wp_nonce_field( 'update-permalink' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( 'update-permalink' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><textarea rows="6" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->mod_rewrite_rules() ); ?></textarea></p>
</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></pre></div>
<a id="trunksrcwpadminoptionsreadingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/options-reading.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-reading.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/options-reading.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,9 +62,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! get_pages() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="show_on_front" type="hidden" value="posts" />
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-if ( 'posts' != get_option( 'show_on_front' ) ) :
- update_option( 'show_on_front', 'posts' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( 'posts' != get_option( 'show_on_front' ) ) :
+ update_option( 'show_on_front', '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"> else :
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'page' == get_option( 'show_on_front' ) && ! get_option( 'page_on_front' ) && ! get_option( 'page_for_posts' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'show_on_front', '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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Your homepage displays' ); ?></th>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <li><label for="page_on_front">
</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">- __( 'Homepage: %s' ), wp_dropdown_pages(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Homepage: %s' ),
+ wp_dropdown_pages(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'page_on_front',
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,12 +101,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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label></li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><label for="page_for_posts">
</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">- __( 'Posts page: %s' ), wp_dropdown_pages(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Posts page: %s' ),
+ wp_dropdown_pages(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'page_for_posts',
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,10 +117,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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label></li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_for_posts' ) == get_option( 'page_on_front' ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_for_posts' ) == get_option( 'page_on_front' ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="front-page-warning" class="error inline"><p><?php _e( '<strong>Warning:</strong> these pages should not be the same!' ); ?></p></div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset></td>
</span></span></pre></div>
<a id="trunksrcwpadminoptionswritingphp"></a>
<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-writing.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-writing.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/options-writing.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Formatting' ); ?></span></legend>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="use_smilies">
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="use_smilies" type="checkbox" id="use_smilies" value="1" <?php checked( '1', get_option( 'use_smilies' ) ); ?> />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php _e( 'Convert emoticons like <code>:-)</code> and <code>:-P</code> to graphics on display' ); ?></label><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e( 'Convert emoticons like <code>:-)</code> and <code>:-P</code> to graphics on display' ); ?></label><br />
</ins><span class="cx" style="display: block; padding: 0 10px"> <label for="use_balanceTags"><input name="use_balanceTags" type="checkbox" id="use_balanceTags" value="1" <?php checked( '1', get_option( 'use_balanceTags' ) ); ?> /> <?php _e( 'WordPress should correct invalidly nested XHTML automatically' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,22 +107,22 @@
</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"> if ( get_option( 'link_manager_enabled' ) ) :
</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"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="default_link_category"><?php _e( 'Default Link Category' ); ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-wp_dropdown_categories(
- array(
- 'hide_empty' => 0,
- 'name' => 'default_link_category',
- 'orderby' => 'name',
- 'selected' => get_option( 'default_link_category' ),
- 'hierarchical' => true,
- 'taxonomy' => 'link_category',
- )
-);
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ wp_dropdown_categories(
+ array(
+ 'hide_empty' => 0,
+ 'name' => 'default_link_category',
+ 'orderby' => 'name',
+ 'selected' => get_option( 'default_link_category' ),
+ 'hierarchical' => true,
+ 'taxonomy' => 'link_category',
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,18 +136,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/options.php */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
</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"> <h2 class="title"><?php _e( 'Post via email' ); ?></h2>
</span><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
-printf(
- /* translators: 1, 2, 3: examples of random email addresses */
- __( 'To post to WordPress by email you must set up a secret email account with POP3 access. Any mail received at this address will be posted, so it’s a good idea to keep this address very secret. Here are three random strings you could use: %1$s, %2$s, %3$s.' ),
- sprintf( '<kbd>%s</kbd>', wp_generate_password( 8, false ) ),
- sprintf( '<kbd>%s</kbd>', wp_generate_password( 8, false ) ),
- sprintf( '<kbd>%s</kbd>', wp_generate_password( 8, false ) )
-);
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ printf(
+ /* translators: 1, 2, 3: examples of random email addresses */
+ __( 'To post to WordPress by email you must set up a secret email account with POP3 access. Any mail received at this address will be posted, so it’s a good idea to keep this address very secret. Here are three random strings you could use: %1$s, %2$s, %3$s.' ),
+ sprintf( '<kbd>%s</kbd>', wp_generate_password( 8, false ) ),
+ sprintf( '<kbd>%s</kbd>', wp_generate_password( 8, false ) ),
+ sprintf( '<kbd>%s</kbd>', wp_generate_password( 8, false ) )
+ );
+ ?>
</ins><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"> <table class="form-table">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,20 +171,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="default_email_category"><?php _e( 'Default Mail Category' ); ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-wp_dropdown_categories(
- array(
- 'hide_empty' => 0,
- 'name' => 'default_email_category',
- 'orderby' => 'name',
- 'selected' => get_option( 'default_email_category' ),
- 'hierarchical' => true,
- )
-);
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ wp_dropdown_categories(
+ array(
+ 'hide_empty' => 0,
+ 'name' => 'default_email_category',
+ 'orderby' => 'name',
+ 'selected' => get_option( 'default_email_category' ),
+ 'hierarchical' => true,
+ )
+ );
+ ?>
</ins><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 do_settings_fields( 'writing', 'post_via_email' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php do_settings_fields( 'writing', 'post_via_email' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </table>
</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">@@ -197,27 +197,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $enable Whether to enable the Update Services settings area. Default true.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( apply_filters( 'enable_update_services_configuration', true ) ) {
</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"> <h2 class="title"><?php _e( 'Update Services' ); ?></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 ( 1 == get_option( 'blog_public' ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 1 == get_option( 'blog_public' ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><label for="ping_sites">
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Codex URL */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see <a href="%s">Update Services</a> on the Codex. Separate multiple service URLs with line breaks.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://codex.wordpress.org/Update_Services' )
</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"> </label></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea name="ping_sites" id="ping_sites" class="large-text code" rows="3"><?php echo esc_textarea( get_option( 'ping_sites' ) ); ?></textarea>
</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 : ?>
</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">
</span><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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Codex URL, 2: Reading Settings URL */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'WordPress is not notifying any <a href="%1$s">Update Services</a> because of your site’s <a href="%2$s">visibility settings</a>.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,10 +224,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://codex.wordpress.org/Update_Services' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'options-reading.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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </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">-<?php endif; ?>
</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 } // enable_update_services_configuration ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_settings_sections( 'writing' ); ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/options.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,8 +80,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">-$whitelist_options = array(
- 'general' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$whitelist_options = array(
+ 'general' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'blogname',
</span><span class="cx" style="display: block; padding: 0 10px"> 'blogdescription',
</span><span class="cx" style="display: block; padding: 0 10px"> 'gmt_offset',
</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"> 'comment_registration',
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_comments_cookies_opt_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">- 'media' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'media' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail_size_w',
</span><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail_size_h',
</span><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail_crop',
</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"> 'image_default_align',
</span><span class="cx" style="display: block; padding: 0 10px"> 'image_default_link_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">- 'reading' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'reading' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'posts_per_page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'posts_per_rss',
</span><span class="cx" style="display: block; padding: 0 10px"> 'rss_use_excerpt',
</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"> 'page_for_posts',
</span><span class="cx" style="display: block; padding: 0 10px"> 'blog_public',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'writing' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'writing' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default_category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'default_email_category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'default_link_category',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,7 +261,8 @@
</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 ( $unregistered ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'options.php', '2.7.0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'options.php',
+ '2.7.0',
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: the option/setting */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The %s setting is unregistered. Unregistered settings are deprecated. See https://codex.wordpress.org/Settings_API' ),
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/plugin-editor.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> } else {
</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><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"> <div id="file-editor-warning" class="notification-dialog-wrap file-editor-warning hide-if-no-js hidden">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="notification-dialog-background"></div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="notification-dialog">
</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"> </div>
</span><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">-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><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 class="cx" style="display: block; padding: 0 10px"> include( ABSPATH . 'wp-admin/admin-footer.php' );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/plugins.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -492,15 +492,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'error_scrape',
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin' => urlencode( $plugin ),
</span><span class="cx" style="display: block; padding: 0 10px"> '_wpnonce' => urlencode( $_GET['_error_nonce'] ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), admin_url( 'plugins.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ admin_url( 'plugins.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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <iframe style="border:0" width="100%" height="70px" src="<?php echo esc_url( $iframe_url ); ?>"></iframe>
</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
</ins><span class="cx" style="display: 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>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> elseif ( isset( $_GET['deleted'] ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> $delete_result = get_transient( 'plugins_delete_result_' . $user_ID );
</span><span class="cx" style="display: block; padding: 0 10px"> // Delete it once we're done.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -543,9 +544,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"> if ( ( ! is_multisite() || is_network_admin() ) && current_user_can( 'install_plugins' ) ) {
</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"> <a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'plugin' ); ?></a>
</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
</ins><span class="cx" style="display: 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 ( strlen( $s ) ) {
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/post.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,7 +242,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'trashed' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'ids' => $post_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $sendback
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $sendback
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</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="trunksrcwpadminpressthisphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/press-this.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/press-this.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/press-this.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,8 +33,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'activate',
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin' => $plugin_file,
</span><span class="cx" style="display: block; padding: 0 10px"> 'from' => 'press-this',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), admin_url( 'plugins.php' )
- ), 'activate-plugin_' . $plugin_file
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ admin_url( 'plugins.php' )
+ ),
+ 'activate-plugin_' . $plugin_file
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $action = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%1$s" aria-label="%2$s">%2$s</a>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,8 +51,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'install-plugin',
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin' => $plugin_slug,
</span><span class="cx" style="display: block; padding: 0 10px"> 'from' => 'press-this',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), self_admin_url( 'update.php' )
- ), 'install-plugin_' . $plugin_slug
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ self_admin_url( 'update.php' )
+ ),
+ 'install-plugin_' . $plugin_slug
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $action = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%1$s" class="install-now" data-slug="%2$s" data-name="%2$s" aria-label="%3$s">%3$s</a>',
</span></span></pre></div>
<a id="trunksrcwpadminprivacyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/privacy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/privacy.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/privacy.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> $privacy_policy_page_content = WP_Privacy_Policy_Content::get_default_content();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $privacy_policy_page_id = wp_insert_post(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $privacy_policy_page_id = wp_insert_post(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => __( 'Privacy Policy' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'draft',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,16 +195,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</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">- $has_pages = (bool) get_posts( array(
- 'post_type' => 'page',
- 'posts_per_page' => 1,
- 'post_status' => array(
- 'publish',
- 'draft',
- ),
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $has_pages = (bool) get_posts(
+ array(
+ 'post_type' => 'page',
+ 'posts_per_page' => 1,
+ 'post_status' => array(
+ 'publish',
+ 'draft',
+ ),
+ )
+ );
</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 ( $has_pages ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $has_pages ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <form method="post" action="">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="page_for_privacy_policy">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Select an existing page:' ); ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/revision.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,7 +63,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'message' => 5,
</span><span class="cx" style="display: block; padding: 0 10px"> 'revision' => $revision->ID,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_edit_post_link( $post->ID, 'url' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_edit_post_link( $post->ID, 'url' )
</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 'view':
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/setup-config.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> header( 'Content-Type: text/html; charset=utf-8' );
</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"> <!DOCTYPE html>
</span><span class="cx" style="display: block; padding: 0 10px"> <html xmlns="http://www.w3.org/1999/xhtml"<?php echo $dir_attr; ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <head>
</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"> </head>
</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/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> } // end function setup_config_display_header();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $language = '';
</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"> if ( ! empty( $loaded_language ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $step_1 .= '&language=' . $loaded_language;
</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"> <h1 class="screen-reader-text"><?php _e( 'Before getting started' ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <ol>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,15 +165,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <li><?php _e( 'Table prefix (if you want to run more than one WordPress in a single database)' ); ?></li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ol>
</span><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
- /* translators: %s: wp-config.php */
- printf(
- __( 'We’re going to use this information to create a %s file.' ),
- '<code>wp-config.php</code>'
- );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /* translators: %s: wp-config.php */
+ printf(
+ __( 'We’re going to use this information to create a %s file.' ),
+ '<code>wp-config.php</code>'
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <strong>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: wp-config-sample.php, 2: wp-config.php */
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'If for any reason this automatic file creation doesn’t work, don’t worry. All this does is fill in the database information to a configuration file. You may also simply open %1$s in a text editor, fill in your information, and save it as %2$s.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,20 +180,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp-config-sample.php</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp-config.php</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </strong>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- /* translators: %s: Codex URL */
- printf(
- __( 'Need more help? <a href="%s">We got it</a>.' ),
- __( 'https://codex.wordpress.org/Editing_wp-config.php' )
- );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /* translators: %s: Codex URL */
+ printf(
+ __( 'Need more help? <a href="%s">We got it</a>.' ),
+ __( 'https://codex.wordpress.org/Editing_wp-config.php' )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'In all likelihood, these items were supplied to you by your Web Host. If you don’t have this information, then you will need to contact them before you can continue. If you’re all ready…' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="step"><a href="<?php echo $step_1; ?>" class="button button-large"><?php _e( 'Let’s go!' ); ?></a></p>
</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
</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 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"> $GLOBALS['wp_locale'] = new WP_Locale();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> setup_config_display_header();
</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"> <h1 class="screen-reader-text"><?php _e( 'Set up your database connection' ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <form method="post" action="setup-config.php?step=2">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Below you should enter your database connection details. If you’re not sure about these, contact your host.' ); ?></p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,14 +237,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td><?php _e( 'If you want to run multiple WordPress installations in a single database, change this.' ); ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- if ( isset( $_GET['noapi'] ) ) {
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( isset( $_GET['noapi'] ) ) {
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input name="noapi" type="hidden" value="1" /><?php } ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="language" value="<?php echo esc_attr( $language ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="step"><input name="submit" type="submit" value="<?php echo htmlspecialchars( __( 'Submit' ), ENT_QUOTES ); ?>" class="button button-large" /></p>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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 2:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -387,24 +387,24 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_writable( ABSPATH ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> setup_config_display_header();
</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"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
- /* translators: %s: wp-config.php */
- printf( __( 'Sorry, but I can’t write the %s file.' ), '<code>wp-config.php</code>' );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /* translators: %s: wp-config.php */
+ printf( __( 'Sorry, but I can’t write the %s file.' ), '<code>wp-config.php</code>' );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><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
- /* translators: %s: wp-config.php */
- printf( __( 'You can create the %s file manually and paste the following text into it.' ), '<code>wp-config.php</code>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /* translators: %s: wp-config.php */
+ printf( __( 'You can create the %s file manually and paste the following text into it.' ), '<code>wp-config.php</code>' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $config_text = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $config_text = '';
</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 ( $config_file as $line ) {
- $config_text .= htmlentities( $line, ENT_COMPAT, 'UTF-8' );
- }
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $config_file as $line ) {
+ $config_text .= htmlentities( $line, ENT_COMPAT, 'UTF-8' );
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php echo $config_text; ?></textarea>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'After you’ve done that, click “Run the installation.”' ); ?></p>
</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"> </script>
</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
</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"> * If this file doesn't exist, then we are using the wp-config-sample.php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -437,12 +437,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> fclose( $handle );
</span><span class="cx" style="display: block; padding: 0 10px"> chmod( $path_to_wp_config, 0666 );
</span><span class="cx" style="display: block; padding: 0 10px"> setup_config_display_header();
</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"> <h1 class="screen-reader-text"><?php _e( 'Successful database connection' ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'All right, sparky! You’ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to…' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the installation' ); ?></a></p>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/theme-editor.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> if ( $file_description != $file_show ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $description .= ' <span>(' . esc_html( $file_show ) . ')</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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</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">@@ -271,7 +271,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $error ) :
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="error"><p>' . __( 'Oops, no such file exists! Double check the name and try again, merci.' ) . '</p></div>';
</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">-?>
</del><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="theme-editor.php" method="post">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nonce_field( 'edit-theme_' . $stylesheet . '_' . $relative_file, 'nonce' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,7 +296,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_writeable( $file ) ) {
</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"> <strong><?php _e( 'Caution:' ); ?></strong><?php } ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'This is a file in your current parent theme.' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</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"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_print_file_editor_templates(); ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> endif; // $error
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -331,7 +331,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</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><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"> <div id="file-editor-warning" class="notification-dialog-wrap file-editor-warning hide-if-no-js hidden">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="notification-dialog-background"></div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="notification-dialog">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -356,7 +356,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"> </div>
</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
</ins><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 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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/theme-install.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,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"> wp_localize_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'theme', '_wpThemeSettings', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'theme',
+ '_wpThemeSettings',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'themes' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'isInstall' => true,
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/themes.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> wp_reset_vars( array( 'theme', 'search' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'theme', '_wpThemeSettings', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'theme',
+ '_wpThemeSettings',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'themes' => $themes,
</span><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'canInstall' => ( ! is_multisite() && current_user_can( 'install_themes' ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,9 +174,9 @@
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! validate_current_theme() || isset( $_GET['broken'] ) ) :
</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"> <div id="message1" class="updated notice is-dismissible"><p><?php _e( 'The active theme is broken. Reverting to the default theme.' ); ?></p></div>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> elseif ( isset( $_GET['activated'] ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['previewed'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,11 +186,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> elseif ( isset( $_GET['deleted'] ) ) :
</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"> <div id="message3" class="updated notice is-dismissible"><p><?php _e( 'Theme deleted.' ); ?></p></div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( isset( $_GET['delete-active-child'] ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="message4" class="error"><p><?php _e( 'You cannot delete a theme while it has an active child theme.' ); ?></p></div>
</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
</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"> $ct = wp_get_theme();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,16 +337,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // List broken themes, if any.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() && current_user_can( 'edit_themes' ) && $broken_themes = wp_get_themes( array( 'errors' => true ) ) ) {
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="broken-themes">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php _e( 'Broken Themes' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'The following themes are installed but incomplete.' ); ?></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">-<?php
-$can_delete = current_user_can( 'delete_themes' );
-$can_install = current_user_can( 'install_themes' );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $can_delete = current_user_can( 'delete_themes' );
+ $can_install = current_user_can( 'install_themes' );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <table>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th><?php _ex( 'Name', 'theme name' ); ?></th>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -367,7 +369,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'delete',
</span><span class="cx" style="display: block; padding: 0 10px"> 'stylesheet' => urlencode( $stylesheet ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), admin_url( 'themes.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ admin_url( 'themes.php' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $delete_url = wp_nonce_url( $delete_url, 'delete-theme_' . $stylesheet );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -384,7 +387,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'install-theme',
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme' => urlencode( $parent_theme_name ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), admin_url( 'update.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ admin_url( 'update.php' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $install_url = wp_nonce_url( $install_url, 'install-theme_' . $parent_theme_name );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -398,7 +402,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: 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><!-- .wrap -->
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -533,7 +537,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_print_update_row_templates();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'updates', '_wpUpdatesItemCounts', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'updates',
+ '_wpUpdatesItemCounts',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'totals' => wp_get_update_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="trunksrcwpadmintoolsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/tools.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/tools.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/tools.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,19 +19,21 @@
</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">- $title = __('Tools');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = __( 'Tools' );
</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()->add_help_tab( array(
- 'id' => 'converter',
- 'title' => __('Categories and Tags Converter'),
- 'content' => '<p>' . __('Categories have hierarchy, meaning that you can nest sub-categories. Tags do not have hierarchy and cannot be nested. Sometimes people start out using one on their posts, then later realize that the other would work better for their content.' ) . '</p>' .
- '<p>' . __( 'The Categories and Tags Converter link on this screen will take you to the Import screen, where that Converter is one of the plugins you can install. Once that plugin is installed, the Activate Plugin & Run Importer link will take you to a screen where you can choose to convert tags into categories or vice versa.' ) . '</p>',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_current_screen()->add_help_tab(
+ array(
+ 'id' => 'converter',
+ 'title' => __( 'Categories and Tags Converter' ),
+ 'content' => '<p>' . __( 'Categories have hierarchy, meaning that you can nest sub-categories. Tags do not have hierarchy and cannot be nested. Sometimes people start out using one on their posts, then later realize that the other would work better for their content.' ) . '</p>' .
+ '<p>' . __( 'The Categories and Tags Converter link on this screen will take you to the Import screen, where that Converter is one of the plugins you can install. Once that plugin is installed, the Activate Plugin & Run Importer link will take you to a screen where you can choose to convert tags into categories or vice versa.' ) . '</p>',
+ )
+ );
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p><strong>' . __('For more information:') . '</strong></p>' .
- '<p>' . __('<a href="https://codex.wordpress.org/Tools_Screen">Documentation on Tools</a>') . '</p>' .
- '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+ '<p>' . __( '<a href="https://codex.wordpress.org/Tools_Screen">Documentation on Tools</a>' ) . '</p>' .
+ '<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,14 +54,15 @@
</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"> if ( current_user_can( 'import' ) ) :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cats = get_taxonomy('category');
- $tags = get_taxonomy('post_tag');
- if ( current_user_can($cats->cap->manage_terms) || current_user_can($tags->cap->manage_terms) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cats = get_taxonomy( 'category' );
+ $tags = get_taxonomy( 'post_tag' );
+ if ( current_user_can( $cats->cap->manage_terms ) || current_user_can( $tags->cap->manage_terms ) ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="card">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2 class="title"><?php _e( 'Categories and Tags Converter' ) ?></h2>
- <p><?php printf( __('If you want to convert your categories to tags (or vice versa), use the <a href="%s">Categories and Tags Converter</a> available from the Import screen.'), 'import.php' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2 class="title"><?php _e( 'Categories and Tags Converter' ); ?></h2>
+ <p><?php printf( __( 'If you want to convert your categories to tags (or vice versa), use the <a href="%s">Categories and Tags Converter</a> available from the Import screen.' ), 'import.php' ); ?></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">- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/update-core.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> $show_text = esc_js( __( 'Show hidden updates' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $hide_text = esc_js( __( 'Hide hidden updates' ) );
</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"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> jQuery(function( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $( 'dismissed-updates' ).show();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,14 +144,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#show-dismissed' ).click( function() { $( '#dismissed-updates' ).toggle( 'fast' ); } );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<p class="hide-if-no-js"><button type="button" class="button" id="show-dismissed" aria-expanded="false">' . __( 'Show hidden updates' ) . '</button></p>';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<ul id="dismissed-updates" class="core-updates dismissed">';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( (array) $dismissed as $update ) {
- echo '<li>';
- list_core_update( $update );
- echo '</li>';
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $dismissed as $update ) {
+ echo '<li>';
+ list_core_update( $update );
+ echo '</li>';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '</ul>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> <h2><?php _e( 'Plugins' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'The following plugins have new versions available. Check the ones you want to update and then click “Update Plugins”.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <form method="post" action="<?php echo esc_url( $form_action ); ?>" name="upgrade-plugins" class="upgrade">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php wp_nonce_field( 'upgrade-core' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( 'upgrade-core' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><input id="upgrade-plugins" class="button" type="submit" value="<?php esc_attr_e( 'Update Plugins' ); ?>" name="upgrade" /></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="widefat updates-table" id="update-plugins-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <thead>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,52 +260,52 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </thead>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <tbody class="plugins">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-foreach ( (array) $plugins as $plugin_file => $plugin_data ) {
- $plugin_data = (object) _get_plugin_data_markup_translate( $plugin_file, (array) $plugin_data, false, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ foreach ( (array) $plugins as $plugin_file => $plugin_data ) {
+ $plugin_data = (object) _get_plugin_data_markup_translate( $plugin_file, (array) $plugin_data, false, 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">- $icon = '<span class="dashicons dashicons-admin-plugins"></span>';
- $preferred_icons = array( 'svg', '2x', '1x', 'default' );
- foreach ( $preferred_icons as $preferred_icon ) {
- if ( ! empty( $plugin_data->update->icons[ $preferred_icon ] ) ) {
- $icon = '<img src="' . esc_url( $plugin_data->update->icons[ $preferred_icon ] ) . '" alt="" />';
- break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $icon = '<span class="dashicons dashicons-admin-plugins"></span>';
+ $preferred_icons = array( 'svg', '2x', '1x', 'default' );
+ foreach ( $preferred_icons as $preferred_icon ) {
+ if ( ! empty( $plugin_data->update->icons[ $preferred_icon ] ) ) {
+ $icon = '<img src="' . esc_url( $plugin_data->update->icons[ $preferred_icon ] ) . '" alt="" />';
+ break;
+ }
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Get plugin compat for running version of WordPress.
- if ( isset( $plugin_data->update->tested ) && version_compare( $plugin_data->update->tested, $cur_wp_version, '>=' ) ) {
- $compat = '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: 100%% (according to its author)' ), $cur_wp_version );
- } else {
- $compat = '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: Unknown' ), $cur_wp_version );
- }
- // Get plugin compat for updated version of WordPress.
- if ( $core_update_version ) {
- if ( isset( $plugin_data->update->tested ) && version_compare( $plugin_data->update->tested, $core_update_version, '>=' ) ) {
- $compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: 100%% (according to its author)' ), $core_update_version );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get plugin compat for running version of WordPress.
+ if ( isset( $plugin_data->update->tested ) && version_compare( $plugin_data->update->tested, $cur_wp_version, '>=' ) ) {
+ $compat = '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: 100%% (according to its author)' ), $cur_wp_version );
</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">- $compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: Unknown' ), $core_update_version );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $compat = '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: Unknown' ), $cur_wp_version );
</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 the upgrade notice for the new plugin version.
- if ( isset( $plugin_data->update->upgrade_notice ) ) {
- $upgrade_notice = '<br />' . strip_tags( $plugin_data->update->upgrade_notice );
- } else {
- $upgrade_notice = '';
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get plugin compat for updated version of WordPress.
+ if ( $core_update_version ) {
+ if ( isset( $plugin_data->update->tested ) && version_compare( $plugin_data->update->tested, $core_update_version, '>=' ) ) {
+ $compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: 100%% (according to its author)' ), $core_update_version );
+ } else {
+ $compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: Unknown' ), $core_update_version );
+ }
+ }
+ // Get the upgrade notice for the new plugin version.
+ if ( isset( $plugin_data->update->upgrade_notice ) ) {
+ $upgrade_notice = '<br />' . strip_tags( $plugin_data->update->upgrade_notice );
+ } else {
+ $upgrade_notice = '';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $details_url = self_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_data->update->slug . '§ion=changelog&TB_iframe=true&width=640&height=662' );
- $details = sprintf(
- '<a href="%1$s" class="thickbox open-plugin-details-modal" aria-label="%2$s">%3$s</a>',
- esc_url( $details_url ),
- /* translators: 1: plugin name, 2: version number */
- esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_data->Name, $plugin_data->update->new_version ) ),
- /* translators: %s: plugin version */
- sprintf( __( 'View version %s details.' ), $plugin_data->update->new_version )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $details_url = self_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_data->update->slug . '§ion=changelog&TB_iframe=true&width=640&height=662' );
+ $details = sprintf(
+ '<a href="%1$s" class="thickbox open-plugin-details-modal" aria-label="%2$s">%3$s</a>',
+ esc_url( $details_url ),
+ /* translators: 1: plugin name, 2: version number */
+ esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_data->Name, $plugin_data->update->new_version ) ),
+ /* translators: %s: plugin version */
+ sprintf( __( 'View version %s details.' ), $plugin_data->update->new_version )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $checkbox_id = 'checkbox_' . md5( $plugin_data->Name );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $checkbox_id = 'checkbox_' . md5( $plugin_data->Name );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <td class="check-column">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr( $plugin_file ); ?>" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -320,7 +320,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> <td class="plugin-title"><p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo $icon; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo $icon; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <strong><?php echo $plugin_data->Name; ?></strong>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: plugin version, 2: new version */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -329,13 +329,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_data->Version,
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_data->update->new_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 ' ' . $details . $compat . $upgrade_notice;
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo ' ' . $details . $compat . $upgrade_notice;
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p></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
-}
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tbody>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <tfoot>
</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"> </table>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><input id="upgrade-plugins-2" class="button" type="submit" value="<?php esc_attr_e( 'Update Plugins' ); ?>" name="upgrade" /></p>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -362,12 +362,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"> $form_action = 'update-core.php?action=do-theme-upgrade';
</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"> <h2><?php _e( 'Themes' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'The following themes have new versions available. Check the ones you want to update and then click “Update Themes”.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php printf( __( '<strong>Please Note:</strong> Any customizations you have made to theme files will be lost. Please consider using <a href="%s">child themes</a> for modifications.' ), __( 'https://codex.wordpress.org/Child_Themes' ) ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <form method="post" action="<?php echo esc_url( $form_action ); ?>" name="upgrade-themes" class="upgrade">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php wp_nonce_field( 'upgrade-core' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( 'upgrade-core' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><input id="upgrade-themes" class="button" type="submit" value="<?php esc_attr_e( 'Update Themes' ); ?>" name="upgrade" /></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="widefat updates-table" id="update-themes-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <thead>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -378,10 +378,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </thead>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <tbody class="plugins">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-foreach ( $themes as $stylesheet => $theme ) {
- $checkbox_id = 'checkbox_' . md5( $theme->get( 'Name' ) );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ foreach ( $themes as $stylesheet => $theme ) {
+ $checkbox_id = 'checkbox_' . md5( $theme->get( 'Name' ) );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <td class="check-column">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr( $stylesheet ); ?>" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -405,12 +405,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $theme->display( 'Version' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $theme->update['new_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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p></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
-}
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tbody>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <tfoot>
</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"> </table>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><input id="upgrade-themes-2" class="button" type="submit" value="<?php esc_attr_e( 'Update Themes' ); ?>" name="upgrade" /></p>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -481,52 +481,53 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // that it's safe to do so. This only happens when there are no new files to create.
</span><span class="cx" style="display: block; padding: 0 10px"> $allow_relaxed_file_ownership = ! $reinstall && isset( $update->new_files ) && ! $update->new_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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</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 _e( 'Update WordPress' ); ?></h1>
</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
</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 ( false === ( $credentials = request_filesystem_credentials( $url, '', false, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership ) ) ) {
- echo '</div>';
- return;
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === ( $credentials = request_filesystem_credentials( $url, '', false, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership ) ) ) {
+ echo '</div>';
+ return;
+ }
</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 ( ! WP_Filesystem( $credentials, ABSPATH, $allow_relaxed_file_ownership ) ) {
- // Failed to connect, Error and request again
- request_filesystem_credentials( $url, '', true, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership );
- echo '</div>';
- return;
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! WP_Filesystem( $credentials, ABSPATH, $allow_relaxed_file_ownership ) ) {
+ // Failed to connect, Error and request again
+ request_filesystem_credentials( $url, '', true, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership );
+ echo '</div>';
+ return;
+ }
</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 ( $wp_filesystem->errors->has_errors() ) {
- foreach ( $wp_filesystem->errors->get_error_messages() as $message ) {
- show_message( $message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $wp_filesystem->errors->has_errors() ) {
+ foreach ( $wp_filesystem->errors->get_error_messages() as $message ) {
+ show_message( $message );
+ }
+ echo '</div>';
+ return;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '</div>';
- return;
-}
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( $reinstall ) {
- $update->response = 'reinstall';
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $reinstall ) {
+ $update->response = 'reinstall';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'update_feedback', 'show_message' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $upgrader = new Core_Upgrader();
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $upgrader->upgrade(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $update, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $update,
+ array(
</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="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( $result ) ) {
- show_message( $result );
- if ( 'up_to_date' != $result->get_error_code() && 'locked' != $result->get_error_code() ) {
- show_message( __( 'Installation Failed' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_wp_error( $result ) ) {
+ show_message( $result );
+ if ( 'up_to_date' != $result->get_error_code() && 'locked' != $result->get_error_code() ) {
+ show_message( __( 'Installation Failed' ) );
+ }
+ echo '</div>';
+ return;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '</div>';
- return;
-}
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> show_message( __( 'WordPress updated successfully' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> show_message( '<span class="hide-if-no-js">' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%2$s">here</a>.' ), $result, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '</span>' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -668,7 +669,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</div>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'updates', '_wpUpdatesItemCounts', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'updates',
+ '_wpUpdatesItemCounts',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'totals' => wp_get_update_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">@@ -702,7 +705,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"> wp_localize_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'updates', '_wpUpdatesItemCounts', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'updates',
+ '_wpUpdatesItemCounts',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'totals' => wp_get_update_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">@@ -738,7 +743,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</div>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'updates', '_wpUpdatesItemCounts', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'updates',
+ '_wpUpdatesItemCounts',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'totals' => wp_get_update_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">@@ -776,7 +783,9 @@
</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"> wp_localize_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'updates', '_wpUpdatesItemCounts', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'updates',
+ '_wpUpdatesItemCounts',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'totals' => wp_get_update_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">@@ -803,7 +812,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $upgrader->bulk_upgrade();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'updates', '_wpUpdatesItemCounts', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'updates',
+ '_wpUpdatesItemCounts',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'totals' => wp_get_update_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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/update.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> check_admin_referer( 'install-plugin_' . $plugin );
</span><span class="cx" style="display: block; padding: 0 10px"> $api = plugins_api(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'plugin_information', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'plugin_information',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => $plugin,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'sections' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,7 +226,8 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'theme_information', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'theme_information',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => $theme,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'sections' => false,
</span></span></pre></div>
<a id="trunksrcwpadminupgradephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/upgrade.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/upgrade.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <p><?php _e( 'Your WordPress database is already up-to-date!' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="step"><a class="button button-large" href="<?php echo get_option( 'home' ); ?>/"><?php _e( 'Continue' ); ?></a></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">-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> elseif ( ! $php_compat || ! $mysql_compat ) :
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $mysql_compat && ! $php_compat ) {
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.' ), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
</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"> } elseif ( ! $mysql_compat ) {
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_mysql_version, $mysql_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">-?>
-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> else :
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $step ) :
</span><span class="cx" style="display: block; padding: 0 10px"> case 0:
</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"> $goback = esc_url_raw( $goback );
</span><span class="cx" style="display: block; padding: 0 10px"> $goback = urlencode( $goback );
</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"> <h1><?php _e( 'Database Update Required' ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'WordPress has been updated! Before we send you on your way, we have to update your database to the newest version.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'The database update process may take a little while, so please be patient.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="step"><a class="button button-large button-primary" href="upgrade.php?step=1&backto=<?php echo $goback; ?>"><?php _e( 'Update WordPress Database' ); ?></a></p>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 1:
</span><span class="cx" style="display: block; padding: 0 10px"> wp_upgrade();
</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"> $backto = ! empty( $_GET['backto'] ) ? wp_unslash( urldecode( $_GET['backto'] ) ) : __get_option( 'home' ) . '/';
</span><span class="cx" style="display: block; padding: 0 10px"> $backto = esc_url( $backto );
</span><span class="cx" style="display: block; padding: 0 10px"> $backto = wp_validate_redirect( $backto, __get_option( 'home' ) . '/' );
</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"> <h1><?php _e( 'Update Complete' ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Your WordPress database has been successfully updated!' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="step"><a class="button button-large" href="<?php echo $backto; ?>"><?php _e( 'Continue' ); ?></a></p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,13 +117,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"> <pre>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php printf( __( '%s queries' ), $wpdb->num_queries ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php printf( __( '%s queries' ), $wpdb->num_queries ); ?>
</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 printf( __( '%s seconds' ), timer_stop( 0 ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php printf( __( '%s seconds' ), timer_stop( 0 ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </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">-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><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"> endif;
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/upload.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,7 +40,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"> wp_localize_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'media-grid', '_wpMediaGridSettings', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'media-grid',
+ '_wpMediaGridSettings',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'adminUrl' => parse_url( self_admin_url(), PHP_URL_PATH ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'queryVars' => (object) $vars,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,7 +86,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 ( current_user_can( 'upload_files' ) ) {
</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"> <a href="<?php echo admin_url( 'media-new.php' ); ?>" class="page-title-action aria-button-if-js"><?php echo esc_html_x( 'Add New', 'file' ); ?></a>
</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">@@ -160,7 +162,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'trashed' => count( $post_ids ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'ids' => join( ',', $post_ids ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $location
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $location
</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 'untrash':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,7 +266,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 ( current_user_can( 'upload_files' ) ) {
</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"> <a href="<?php echo admin_url( 'media-new.php' ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'file' ); ?></a>
</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">@@ -351,7 +354,7 @@
</span><span class="cx" style="display: 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( $message ) ) {
</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"> <div id="message" class="updated notice is-dismissible"><p><?php echo $message; ?></p></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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/user-edit.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,52 +184,52 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sessions = WP_Session_Tokens::get_instance( $profileuser->ID );
</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-header.php' );
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( ! IS_PROFILE_PAGE && is_super_admin( $profileuser->ID ) && current_user_can( 'manage_network_options' ) ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! IS_PROFILE_PAGE && is_super_admin( $profileuser->ID ) && current_user_can( 'manage_network_options' ) ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="notice notice-info"><p><strong><?php _e( 'Important:' ); ?></strong> <?php _e( 'This user has super admin privileges.' ); ?></p></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">-<?php if ( isset( $_GET['updated'] ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( isset( $_GET['updated'] ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="message" class="updated notice is-dismissible">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( IS_PROFILE_PAGE ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( IS_PROFILE_PAGE ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><strong><?php _e( 'Profile updated.' ); ?></strong></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><strong><?php _e( 'User updated.' ); ?></strong></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $wp_http_referer && false === strpos( $wp_http_referer, 'user-new.php' ) && ! IS_PROFILE_PAGE ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $wp_http_referer && false === strpos( $wp_http_referer, 'user-new.php' ) && ! IS_PROFILE_PAGE ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><a href="<?php echo esc_url( wp_validate_redirect( esc_url_raw( $wp_http_referer ), self_admin_url( 'users.php' ) ) ); ?>"><?php _e( '← Back to Users' ); ?></a></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endif; ?>
-<?php if ( isset( $_GET['error'] ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endif; ?>
+ <?php if ( isset( $_GET['error'] ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="notice notice-error">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( 'new-email' == $_GET['error'] ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'new-email' == $_GET['error'] ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Error while saving the new email address. Please try again.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endif; ?>
-<?php if ( isset( $errors ) && is_wp_error( $errors ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endif; ?>
+ <?php if ( isset( $errors ) && is_wp_error( $errors ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="error"><p><?php echo implode( "</p>\n<p>", $errors->get_error_messages() ); ?></p></div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endif; ?>
</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><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap" id="profile-page">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="wp-heading-inline">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-echo esc_html( $title );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ echo esc_html( $title );
+ ?>
</ins><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 ( ! IS_PROFILE_PAGE ) {
- if ( current_user_can( 'create_users' ) ) {
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( ! IS_PROFILE_PAGE ) {
+ if ( current_user_can( 'create_users' ) ) {
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
</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
</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">+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -241,12 +241,12 @@
</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"> do_action( 'user_edit_form_tag' );
</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"> >
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php wp_nonce_field( 'update-user_' . $user_id ); ?>
-<?php if ( $wp_http_referer ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( 'update-user_' . $user_id ); ?>
+ <?php if ( $wp_http_referer ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="wp_http_referer" value="<?php echo esc_url( $wp_http_referer ); ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endif; ?>
</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"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="from" value="profile" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="checkuser_id" value="<?php echo get_current_user_id(); ?>" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,25 +255,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e( 'Personal Options' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr class="user-rich-editing-wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Visual Editor' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php checked( 'false', $profileuser->rich_editing ); ?> /> <?php _e( 'Disable the visual editor when writing' ); ?></label></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; ?>
-<?php
-$show_syntax_highlighting_preference = (
- // For Custom HTML widget and Additional CSS in Customizer.
- user_can( $profileuser, 'edit_theme_options' )
- ||
- // Edit plugins.
- user_can( $profileuser, 'edit_plugins' )
- ||
- // Edit themes.
- user_can( $profileuser, 'edit_themes' )
- );
- ?>
- <?php if ( $show_syntax_highlighting_preference ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endif; ?>
+ <?php
+ $show_syntax_highlighting_preference = (
+ // For Custom HTML widget and Additional CSS in Customizer.
+ user_can( $profileuser, 'edit_theme_options' )
+ ||
+ // Edit plugins.
+ user_can( $profileuser, 'edit_plugins' )
+ ||
+ // Edit themes.
+ user_can( $profileuser, 'edit_themes' )
+ );
+ ?>
+ <?php if ( $show_syntax_highlighting_preference ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr class="user-syntax-highlighting-wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Syntax Highlighting' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,30 +281,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( count( $_wp_admin_css_colors ) > 1 && has_action( 'admin_color_scheme_picker' ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( count( $_wp_admin_css_colors ) > 1 && has_action( 'admin_color_scheme_picker' ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr class="user-admin-color-wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Admin Color Scheme' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
- /**
- * Fires in the 'Admin Color Scheme' section of the user editing screen.
- *
- * The section is only enabled if a callback is hooked to the action,
- * and if there is more than one defined color scheme for the admin.
- *
- * @since 3.0.0
- * @since 3.8.1 Added `$user_id` parameter.
- *
- * @param int $user_id The user ID.
- */
- do_action( 'admin_color_scheme_picker', $user_id );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Fires in the 'Admin Color Scheme' section of the user editing screen.
+ *
+ * The section is only enabled if a callback is hooked to the action,
+ * and if there is more than one defined color scheme for the admin.
+ *
+ * @since 3.0.0
+ * @since 3.8.1 Added `$user_id` parameter.
+ *
+ * @param int $user_id The user ID.
+ */
+ do_action( 'admin_color_scheme_picker', $user_id );
+ ?>
</ins><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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> endif; // $_wp_admin_css_colors
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) :
</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"> <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><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php checked( 'true', $profileuser->comment_shortcuts ); ?> /> <?php _e( 'Enable keyboard shortcuts for comment moderation.' ); ?></label> <?php _e( '<a href="https://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>' ); ?></td>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -315,73 +315,73 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Toolbar' ); ?></span></legend>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="admin_bar_front">
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="admin_bar_front" type="checkbox" id="admin_bar_front" value="1"<?php checked( _get_admin_bar_pref( 'front', $profileuser->ID ) ); ?> />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php _e( 'Show Toolbar when viewing site' ); ?></label><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e( 'Show Toolbar when viewing site' ); ?></label><br />
</ins><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</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
-$languages = get_available_languages();
-if ( $languages ) :
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $languages = get_available_languages();
+ if ( $languages ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr class="user-language-wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php /* translators: The user language selection field label */ ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php /* translators: The user language selection field label */ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <label for="locale"><?php _e( 'Language' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> </th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- $user_locale = $profileuser->locale;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $user_locale = $profileuser->locale;
</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 ( 'en_US' === $user_locale ) {
- $user_locale = '';
- } elseif ( '' === $user_locale || ! in_array( $user_locale, $languages, true ) ) {
- $user_locale = 'site-default';
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'en_US' === $user_locale ) {
+ $user_locale = '';
+ } elseif ( '' === $user_locale || ! in_array( $user_locale, $languages, true ) ) {
+ $user_locale = 'site-default';
+ }
</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_languages(
- array(
- 'name' => 'locale',
- 'id' => 'locale',
- 'selected' => $user_locale,
- 'languages' => $languages,
- 'show_available_translations' => false,
- 'show_option_site_default' => true,
- )
- );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_dropdown_languages(
+ array(
+ 'name' => 'locale',
+ 'id' => 'locale',
+ 'selected' => $user_locale,
+ 'languages' => $languages,
+ 'show_available_translations' => false,
+ 'show_option_site_default' => true,
+ )
+ );
+ ?>
</ins><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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> endif;
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Fires at the end of the 'Personal Options' settings table on the user editing screen.
- *
- * @since 2.7.0
- *
- * @param WP_User $profileuser The current WP_User object.
- */
-do_action( 'personal_options', $profileuser );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Fires at the end of the 'Personal Options' settings table on the user editing screen.
+ *
+ * @since 2.7.0
+ *
+ * @param WP_User $profileuser The current WP_User object.
+ */
+ do_action( 'personal_options', $profileuser );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-if ( IS_PROFILE_PAGE ) {
- /**
- * Fires after the 'Personal Options' settings table on the 'Your Profile' editing screen.
- *
- * The action only fires if the current user is editing their own profile.
- *
- * @since 2.0.0
- *
- * @param WP_User $profileuser The current WP_User object.
- */
- do_action( 'profile_personal_options', $profileuser );
-}
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( IS_PROFILE_PAGE ) {
+ /**
+ * Fires after the 'Personal Options' settings table on the 'Your Profile' editing screen.
+ *
+ * The action only fires if the current user is editing their own profile.
+ *
+ * @since 2.0.0
+ *
+ * @param WP_User $profileuser The current WP_User object.
+ */
+ do_action( 'profile_personal_options', $profileuser );
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e( 'Name' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -391,33 +391,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td><input type="text" name="user_login" id="user_login" value="<?php echo esc_attr( $profileuser->user_login ); ?>" disabled="disabled" class="regular-text" /> <span class="description"><?php _e( 'Usernames cannot be changed.' ); ?></span></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</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_PROFILE_PAGE && ! is_network_admin() && current_user_can( 'promote_user', $profileuser->ID ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! IS_PROFILE_PAGE && ! is_network_admin() && current_user_can( 'promote_user', $profileuser->ID ) ) : ?>
</ins><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-// Compare user role against currently editable roles
-$user_roles = array_intersect( array_values( $profileuser->roles ), array_keys( get_editable_roles() ) );
-$user_role = reset( $user_roles );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ // Compare user role against currently editable roles
+ $user_roles = array_intersect( array_values( $profileuser->roles ), array_keys( get_editable_roles() ) );
+ $user_role = reset( $user_roles );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// print the full list of roles with the primary one selected.
-wp_dropdown_roles( $user_role );
</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.
+ wp_dropdown_roles( $user_role );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><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.
-if ( $user_role ) {
- echo '<option value="">' . __( '— No role for this site —' ) . '</option>';
-} else {
- echo '<option value="" selected="selected">' . __( '— No role for this site —' ) . '</option>';
-}
-?>
</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.
+ if ( $user_role ) {
+ echo '<option value="">' . __( '— No role for this site —' ) . '</option>';
+ } else {
+ echo '<option value="" selected="selected">' . __( '— No role for this site —' ) . '</option>';
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </select></td></tr>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> endif; //!IS_PROFILE_PAGE
</span><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><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"> <tr class="user-super-admin-wrap"><th><?php _e( 'Super Admin' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( $profileuser->user_email != get_site_option( 'admin_email' ) || ! is_super_admin( $profileuser->ID ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $profileuser->user_email != get_site_option( 'admin_email' ) || ! is_super_admin( $profileuser->ID ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked( is_super_admin( $profileuser->ID ) ); ?> /> <?php _e( 'Grant this user super admin privileges for the Network.' ); ?></label></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Super admin privileges cannot be removed because this user has the network admin email.' ); ?></p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -470,9 +470,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $public_display = array_unique( $public_display );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $public_display as $id => $item ) {
</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"> <option <?php selected( $profileuser->display_name, $item ); ?>><?php echo $item; ?></option>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -488,30 +488,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td><input type="email" name="email" id="email" aria-describedby="email-description" value="<?php echo esc_attr( $profileuser->user_email ); ?>" class="regular-text ltr" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $profileuser->ID == $current_user->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">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="description" id="email-description">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'If you change this we will send you an email at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ); ?>
</span><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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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"> $new_email = get_user_meta( $current_user->ID, '_new_email', true );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $new_email && $new_email['newemail'] != $current_user->user_email && $profileuser->ID == $current_user->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">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="updated inline">
</span><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
- printf(
- /* translators: %s: new email */
- __( 'There is a pending change of your email to %s.' ),
- '<code>' . esc_html( $new_email['newemail'] ) . '</code>'
- );
- printf(
- ' <a href="%1$s">%2$s</a>',
- esc_url( wp_nonce_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ), 'dismiss-' . $current_user->ID . '_new_email' ) ),
- __( 'Cancel' )
- );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ printf(
+ /* translators: %s: new email */
+ __( 'There is a pending change of your email to %s.' ),
+ '<code>' . esc_html( $new_email['newemail'] ) . '</code>'
+ );
+ printf(
+ ' <a href="%1$s">%2$s</a>',
+ esc_url( wp_nonce_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ), 'dismiss-' . $current_user->ID . '_new_email' ) ),
+ __( 'Cancel' )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -523,30 +523,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td><input type="url" name="url" id="url" value="<?php echo esc_attr( $profileuser->user_url ); ?>" class="regular-text code" /></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</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
- foreach ( wp_get_user_contact_methods( $profileuser ) as $name => $desc ) {
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ foreach ( wp_get_user_contact_methods( $profileuser ) as $name => $desc ) {
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr class="user-<?php echo $name; ?>-wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <th><label for="<?php echo $name; ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- /**
- * Filters a user contactmethod label.
- *
- * The dynamic portion of the filter hook, `$name`, refers to
- * each of the keys in the contactmethods array.
- *
- * @since 2.9.0
- *
- * @param string $desc The translatable label for the contactmethod.
- */
- echo apply_filters( "user_{$name}_label", $desc );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Filters a user contactmethod label.
+ *
+ * The dynamic portion of the filter hook, `$name`, refers to
+ * each of the keys in the contactmethods array.
+ *
+ * @since 2.9.0
+ *
+ * @param string $desc The translatable label for the contactmethod.
+ */
+ echo apply_filters( "user_{$name}_label", $desc );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><input type="text" name="<?php echo $name; ?>" id="<?php echo $name; ?>" value="<?php echo esc_attr( $profileuser->$name ); ?>" class="regular-text" /></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
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ }
+ ?>
</ins><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"> <h2><?php IS_PROFILE_PAGE ? _e( 'About Yourself' ) : _e( 'About the user' ); ?></h2>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -558,22 +558,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="description"><?php _e( 'Share a little biographical information to fill out your profile. This may be shown publicly.' ); ?></p></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</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_option( 'show_avatars' ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( get_option( 'show_avatars' ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr class="user-profile-picture">
</span><span class="cx" style="display: block; padding: 0 10px"> <th><?php _e( 'Profile Picture' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo get_avatar( $user_id ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo get_avatar( $user_id ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="description">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- if ( IS_PROFILE_PAGE ) {
- /* translators: %s: Gravatar URL */
- $description = sprintf(
- __( 'You can change your profile picture on <a href="%s">Gravatar</a>.' ),
- __( 'https://en.gravatar.com/' )
- );
- } else {
- $description = '';
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( IS_PROFILE_PAGE ) {
+ /* translators: %s: Gravatar URL */
+ $description = sprintf(
+ __( 'You can change your profile picture on <a href="%s">Gravatar</a>.' ),
+ __( 'https://en.gravatar.com/' )
+ );
+ } else {
+ $description = '';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the user profile picture description displayed under the Gravatar.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -585,25 +585,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_User $profileuser The current WP_User object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> echo apply_filters( 'user_profile_picture_description', $description, $profileuser );
</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"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</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
- /**
- * Filters the display of the password fields.
- *
- * @since 1.5.1
- * @since 2.8.0 Added the `$profileuser` parameter.
- * @since 4.4.0 Now evaluated only in user-edit.php.
- *
- * @param bool $show Whether to show the password fields. Default true.
- * @param WP_User $profileuser User object for the current user to edit.
- */
- if ( $show_password_fields = apply_filters( 'show_password_fields', true, $profileuser ) ) :
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Filters the display of the password fields.
+ *
+ * @since 1.5.1
+ * @since 2.8.0 Added the `$profileuser` parameter.
+ * @since 4.4.0 Now evaluated only in user-edit.php.
+ *
+ * @param bool $show Whether to show the password fields. Default true.
+ * @param WP_User $profileuser User object for the current user to edit.
+ */
+ if ( $show_password_fields = apply_filters( 'show_password_fields', true, $profileuser ) ) :
+ ?>
</ins><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"> <h2><?php _e( 'Account Management' ); ?></h2>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -644,11 +644,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </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 endif; ?>
</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 ( IS_PROFILE_PAGE && count( $sessions->get_all() ) === 1 ) :
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( IS_PROFILE_PAGE && count( $sessions->get_all() ) === 1 ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr class="user-sessions-wrap hide-if-no-js">
</span><span class="cx" style="display: block; padding: 0 10px"> <th><?php _e( 'Sessions' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td aria-live="assertive">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -685,77 +685,77 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- if ( IS_PROFILE_PAGE ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( IS_PROFILE_PAGE ) {
+ /**
+ * Fires after the 'About Yourself' settings table on the 'Your Profile' editing screen.
+ *
+ * The action only fires if the current user is editing their own profile.
+ *
+ * @since 2.0.0
+ *
+ * @param WP_User $profileuser The current WP_User object.
+ */
+ do_action( 'show_user_profile', $profileuser );
+ } else {
+ /**
+ * Fires after the 'About the User' settings table on the 'Edit User' screen.
+ *
+ * @since 2.0.0
+ *
+ * @param WP_User $profileuser The current WP_User object.
+ */
+ do_action( 'edit_user_profile', $profileuser );
+ }
+ ?>
+
+ <?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">- * Fires after the 'About Yourself' settings table on the 'Your Profile' editing screen.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters whether to display additional capabilities for the user.
</ins><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 only fires if the current user is editing their own profile.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The 'Additional Capabilities' section will only be enabled if
+ * the number of the user's capabilities exceeds their number of
+ * roles.
</ins><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.0.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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $enable Whether to display the capabilities. Default true.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param WP_User $profileuser The current WP_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">- do_action( 'show_user_profile', $profileuser );
- } else {
- /**
- * Fires after the 'About the User' settings table on the 'Edit User' screen.
- *
- * @since 2.0.0
- *
- * @param WP_User $profileuser The current WP_User object.
- */
- do_action( 'edit_user_profile', $profileuser );
- }
- ?>
-
- <?php
- /**
- * Filters whether to display additional capabilities for the user.
- *
- * The 'Additional Capabilities' section will only be enabled if
- * the number of the user's capabilities exceeds their number of
- * roles.
- *
- * @since 2.8.0
- *
- * @param bool $enable Whether to display the capabilities. Default true.
- * @param WP_User $profileuser The current WP_User object.
- */
- if ( count( $profileuser->caps ) > count( $profileuser->roles )
- && apply_filters( 'additional_capabilities_display', true, $profileuser )
- ) :
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( count( $profileuser->caps ) > count( $profileuser->roles )
+ && apply_filters( 'additional_capabilities_display', true, $profileuser )
+ ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e( 'Additional Capabilities' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="user-capabilities-wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Capabilities' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
- $output = '';
-foreach ( $profileuser->caps as $cap => $value ) {
- if ( ! $wp_roles->is_role( $cap ) ) {
- if ( '' != $output ) {
- $output .= ', ';
- }
- $output .= $value ? $cap : sprintf( __( 'Denied: %s' ), $cap );
- }
-}
- echo $output;
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $output = '';
+ foreach ( $profileuser->caps as $cap => $value ) {
+ if ( ! $wp_roles->is_role( $cap ) ) {
+ if ( '' != $output ) {
+ $output .= ', ';
+ }
+ $output .= $value ? $cap : sprintf( __( 'Denied: %s' ), $cap );
+ }
+ }
+ echo $output;
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endif; ?>
</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><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="action" value="update" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="user_id" id="user_id" value="<?php echo esc_attr( $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">-<?php submit_button( IS_PROFILE_PAGE ? __( 'Update Profile' ) : __( 'Update User' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( IS_PROFILE_PAGE ? __( 'Update Profile' ) : __( 'Update User' ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/user-new.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,7 +79,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'update' => 'addnoconfirmation',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $user_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'user-new.php'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'user-new.php'
</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"> $redirect = add_query_arg( array( 'update' => 'could_not_add' ), 'user-new.php' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,7 +88,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $newuser_key = wp_generate_password( 20, false );
</span><span class="cx" style="display: block; padding: 0 10px"> add_option(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'new_user_' . $newuser_key, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'new_user_' . $newuser_key,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $user_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'email' => $user_details->user_email,
</span><span class="cx" style="display: block; padding: 0 10px"> 'role' => $_REQUEST['role'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,7 +178,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wpmu_welcome_user_notification', '__return_false' ); // Disable welcome email
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> wpmu_signup_user(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $new_user_login, $new_user_email, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new_user_login,
+ $new_user_email,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'add_to_blog' => get_current_blog_id(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'new_role' => $_REQUEST['role'],
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,7 +197,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'update' => 'addnoconfirmation',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $new_user['user_id'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'user-new.php'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'user-new.php'
</ins><span class="cx" style="display: 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">@@ -343,7 +348,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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"> if ( ! empty( $messages ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -378,9 +383,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $label = __( 'Email or Username' );
</span><span class="cx" style="display: block; padding: 0 10px"> $type = '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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <form method="post" name="adduser" id="adduser" class="validate" novalidate="novalidate"
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires inside the adduser form tag.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -387,10 +392,10 @@
</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"> do_action( 'user_new_form_tag' );
</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"> >
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="action" type="hidden" value="adduser" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field form-required">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -404,7 +409,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</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 if ( current_user_can( 'manage_network_users' ) ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( current_user_can( 'manage_network_users' ) ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Skip Confirmation Email' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -414,23 +419,23 @@
</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"> </table>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Fires at the end of the new user form.
- *
- * Passes a contextual string to make both types of new user forms
- * uniquely targetable. Contexts are 'add-existing-user' (Multisite),
- * and 'add-new-user' (single site and network admin).
- *
- * @since 3.7.0
- *
- * @param string $type A contextual string specifying which type of new user form the hook follows.
- */
-do_action( 'user_new_form', 'add-existing-user' );
-?>
-<?php submit_button( __( 'Add Existing User' ), 'primary', 'adduser', true, array( 'id' => 'addusersub' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Fires at the end of the new user form.
+ *
+ * Passes a contextual string to make both types of new user forms
+ * uniquely targetable. Contexts are 'add-existing-user' (Multisite),
+ * and 'add-new-user' (single site and network admin).
+ *
+ * @since 3.7.0
+ *
+ * @param string $type A contextual string specifying which type of new user form the hook follows.
+ */
+ do_action( 'user_new_form', 'add-existing-user' );
+ ?>
+ <?php submit_button( __( 'Add Existing User' ), 'primary', 'adduser', true, array( 'id' => 'addusersub' ) ); ?>
</ins><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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> } // is_multisite()
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'create_users' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -437,30 +442,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $do_both ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<h2 id="create-new-user">' . __( 'Add New User' ) . '</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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Create a brand new user and add them to this site.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <form method="post" name="createuser" id="createuser" class="validate" novalidate="novalidate"
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-admin/user-new.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'user_new_form_tag' );
</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"> >
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="action" type="hidden" value="createuser" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php wp_nonce_field( 'create-user', '_wpnonce_create-user' ); ?>
-<?php
-// Load up the passed data, else set to a default.
-$creating = isset( $_POST['createuser'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( 'create-user', '_wpnonce_create-user' ); ?>
+ <?php
+ // Load up the passed data, else set to a default.
+ $creating = isset( $_POST['createuser'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$new_user_login = $creating && isset( $_POST['user_login'] ) ? wp_unslash( $_POST['user_login'] ) : '';
-$new_user_firstname = $creating && isset( $_POST['first_name'] ) ? wp_unslash( $_POST['first_name'] ) : '';
-$new_user_lastname = $creating && isset( $_POST['last_name'] ) ? wp_unslash( $_POST['last_name'] ) : '';
-$new_user_email = $creating && isset( $_POST['email'] ) ? wp_unslash( $_POST['email'] ) : '';
-$new_user_uri = $creating && isset( $_POST['url'] ) ? wp_unslash( $_POST['url'] ) : '';
-$new_user_role = $creating && isset( $_POST['role'] ) ? wp_unslash( $_POST['role'] ) : '';
-$new_user_send_notification = $creating && ! isset( $_POST['send_user_notification'] ) ? false : true;
-$new_user_ignore_pass = $creating && isset( $_POST['noconfirmation'] ) ? wp_unslash( $_POST['noconfirmation'] ) : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new_user_login = $creating && isset( $_POST['user_login'] ) ? wp_unslash( $_POST['user_login'] ) : '';
+ $new_user_firstname = $creating && isset( $_POST['first_name'] ) ? wp_unslash( $_POST['first_name'] ) : '';
+ $new_user_lastname = $creating && isset( $_POST['last_name'] ) ? wp_unslash( $_POST['last_name'] ) : '';
+ $new_user_email = $creating && isset( $_POST['email'] ) ? wp_unslash( $_POST['email'] ) : '';
+ $new_user_uri = $creating && isset( $_POST['url'] ) ? wp_unslash( $_POST['url'] ) : '';
+ $new_user_role = $creating && isset( $_POST['role'] ) ? wp_unslash( $_POST['role'] ) : '';
+ $new_user_send_notification = $creating && ! isset( $_POST['send_user_notification'] ) ? false : true;
+ $new_user_ignore_pass = $creating && isset( $_POST['noconfirmation'] ) ? wp_unslash( $_POST['noconfirmation'] ) : '';
</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">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field form-required">
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="user_login"><?php _e( 'Username' ); ?> <span class="description"><?php _e( '(required)' ); ?></span></label></th>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -470,7 +475,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="email"><?php _e( 'Email' ); ?> <span class="description"><?php _e( '(required)' ); ?></span></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><input name="email" type="email" id="email" value="<?php echo esc_attr( $new_user_email ); ?>" /></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 if ( ! is_multisite() ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php 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="first_name"><?php _e( 'First Name' ); ?> </label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><input name="first_name" type="text" id="first_name" value="<?php echo esc_attr( $new_user_firstname ); ?>" /></td>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -555,12 +560,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </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">-<?php
-/** This action is documented in wp-admin/user-new.php */
-do_action( 'user_new_form', 'add-new-user' );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /** This action is documented in wp-admin/user-new.php */
+ do_action( 'user_new_form', 'add-new-user' );
+ ?>
</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 submit_button( __( 'Add New User' ), 'primary', 'createuser', true, array( 'id' => 'createusersub' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( __( 'Add New User' ), 'primary', 'createuser', true, array( 'id' => 'createusersub' ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } // current_user_can('create_users') ?>
</span></span></pre></div>
<a id="trunksrcwpadminusersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/users.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/users.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,7 +206,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'delete_count' => $delete_count,
</span><span class="cx" style="display: block; padding: 0 10px"> 'update' => $update,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $redirect
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $redirect
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( $redirect );
</span><span class="cx" style="display: block; padding: 0 10px"> exit();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,48 +246,48 @@
</span><span class="cx" style="display: 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( ABSPATH . 'wp-admin/admin-header.php' );
</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"> <form method="post" name="updateusers" id="updateusers">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php wp_nonce_field( 'delete-users' ); ?>
-<?php echo $referer; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( 'delete-users' ); ?>
+ <?php echo $referer; ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1><?php _e( 'Delete Users' ); ?></h1>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( isset( $_REQUEST['error'] ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( isset( $_REQUEST['error'] ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="error">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><strong><?php _e( 'ERROR:' ); ?></strong> <?php _e( 'Please select an option.' ); ?></p>
</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 endif; ?>
</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 ( 1 == count( $userids ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 1 == count( $userids ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'You have specified this user for deletion:' ); ?></p>
</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"> <p><?php _e( 'You have specified these users for deletion:' ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endif; ?>
</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><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
- $go_delete = 0;
-foreach ( $userids as $id ) {
- $user = get_userdata( $id );
- if ( $id == $current_user->ID ) {
- /* translators: 1: user id, 2: user login */
- echo '<li>' . sprintf( __( 'ID #%1$s: %2$s <strong>The current user will not be deleted.</strong>' ), $id, $user->user_login ) . "</li>\n";
- } else {
- /* translators: 1: user id, 2: user login */
- echo '<li><input type="hidden" name="users[]" value="' . esc_attr( $id ) . '" />' . sprintf( __( 'ID #%1$s: %2$s' ), $id, $user->user_login ) . "</li>\n";
- $go_delete++;
- }
-}
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $go_delete = 0;
+ foreach ( $userids as $id ) {
+ $user = get_userdata( $id );
+ if ( $id == $current_user->ID ) {
+ /* translators: 1: user id, 2: user login */
+ echo '<li>' . sprintf( __( 'ID #%1$s: %2$s <strong>The current user will not be deleted.</strong>' ), $id, $user->user_login ) . "</li>\n";
+ } else {
+ /* translators: 1: user id, 2: user login */
+ echo '<li><input type="hidden" name="users[]" value="' . esc_attr( $id ) . '" />' . sprintf( __( 'ID #%1$s: %2$s' ), $id, $user->user_login ) . "</li>\n";
+ $go_delete++;
+ }
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- if ( $go_delete ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( $go_delete ) :
</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 ( ! $users_have_content ) :
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $users_have_content ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="delete_option" value="delete" />
</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"> <?php if ( 1 == $go_delete ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <fieldset><p><legend><?php _e( 'What should be done with content owned by this user?' ); ?></legend></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -320,15 +321,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int[] $userids Array of IDs for users being deleted.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'delete_user_form', $current_user, $userids );
</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"> <input type="hidden" name="action" value="dodelete" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php submit_button( __( 'Confirm Deletion' ), 'primary' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( __( 'Confirm Deletion' ), 'primary' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'There are no valid users selected for deletion.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</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
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -387,46 +388,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"> include( ABSPATH . 'wp-admin/admin-header.php' );
</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"> <form method="post" name="updateusers" id="updateusers">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php wp_nonce_field( 'remove-users' ); ?>
-<?php echo $referer; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( 'remove-users' ); ?>
+ <?php echo $referer; ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1><?php _e( 'Remove Users from Site' ); ?></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 ( 1 == count( $userids ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 1 == count( $userids ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'You have specified this user for removal:' ); ?></p>
</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"> <p><?php _e( 'You have specified these users for removal:' ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endif; ?>
</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><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
- $go_remove = false;
-foreach ( $userids as $id ) {
- $id = (int) $id;
- $user = get_userdata( $id );
- if ( ! current_user_can( 'remove_user', $id ) ) {
- /* translators: 1: user id, 2: user login */
- echo '<li>' . sprintf( __( 'ID #%1$s: %2$s <strong>Sorry, you are not allowed to remove this user.</strong>' ), $id, $user->user_login ) . "</li>\n";
- } else {
- /* translators: 1: user id, 2: user login */
- echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf( __( 'ID #%1$s: %2$s' ), $id, $user->user_login ) . "</li>\n";
- $go_remove = true;
- }
-}
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $go_remove = false;
+ foreach ( $userids as $id ) {
+ $id = (int) $id;
+ $user = get_userdata( $id );
+ if ( ! current_user_can( 'remove_user', $id ) ) {
+ /* translators: 1: user id, 2: user login */
+ echo '<li>' . sprintf( __( 'ID #%1$s: %2$s <strong>Sorry, you are not allowed to remove this user.</strong>' ), $id, $user->user_login ) . "</li>\n";
+ } else {
+ /* translators: 1: user id, 2: user login */
+ echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf( __( 'ID #%1$s: %2$s' ), $id, $user->user_login ) . "</li>\n";
+ $go_remove = true;
+ }
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $go_remove ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $go_remove ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="action" value="doremove" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php submit_button( __( 'Confirm Removal' ), 'primary' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( __( 'Confirm Removal' ), 'primary' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'There are no valid users selected for removal.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</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
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -476,7 +477,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'New user created. <a href="%s">Edit user</a>' ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url(
</span><span class="cx" style="display: block; padding: 0 10px"> add_query_arg(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp_http_referer',
+ urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> self_admin_url( 'user-edit.php?user_id=' . $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">@@ -505,9 +507,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( isset( $errors ) && is_wp_error( $errors ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( isset( $errors ) && is_wp_error( $errors ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="error">
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -517,7 +519,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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"> if ( ! empty( $messages ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -529,18 +531,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="wp-heading-inline">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-echo esc_html( $title );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ echo esc_html( $title );
+ ?>
</ins><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 ( current_user_can( 'create_users' ) ) {
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( current_user_can( 'create_users' ) ) {
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo admin_url( 'user-new.php' ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo admin_url( 'user-new.php' ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
</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
</ins><span class="cx" style="display: 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 ( strlen( $usersearch ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -551,22 +553,22 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php $wp_list_table->views(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $wp_list_table->views(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <form method="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">-<?php $wp_list_table->search_box( __( 'Search Users' ), 'user' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $wp_list_table->search_box( __( 'Search Users' ), 'user' ); ?>
</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 ( ! empty( $_REQUEST['role'] ) ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! empty( $_REQUEST['role'] ) ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="role" value="<?php echo esc_attr( $_REQUEST['role'] ); ?>" />
</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">-<?php $wp_list_table->display(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $wp_list_table->display(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><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><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
</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"> } // end of the $doaction switch
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-admin/widgets.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -295,71 +295,71 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <form action="widgets.php" method="post">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="widget-inside">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-if ( is_callable( $control_callback ) ) {
- call_user_func_array( $control_callback, $control['params'] );
-} else {
- echo '<p>' . __( 'There are no options for this widget.' ) . "</p>\n";
-}
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( is_callable( $control_callback ) ) {
+ call_user_func_array( $control_callback, $control['params'] );
+ } else {
+ echo '<p>' . __( 'There are no options for this widget.' ) . "</p>\n";
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="describe"><?php _e( 'Select both the sidebar for this widget and the position of the widget in that sidebar.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="widget-position">
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="widefat"><thead><tr><th><?php _e( 'Sidebar' ); ?></th><th><?php _e( 'Position' ); ?></th></tr></thead><tbody>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-foreach ( $wp_registered_sidebars as $sbname => $sbvalue ) {
- echo "\t\t<tr><td><label><input type='radio' name='sidebar' value='" . esc_attr( $sbname ) . "'" . checked( $sbname, $sidebar, false ) . " /> $sbvalue[name]</label></td><td>";
- if ( 'wp_inactive_widgets' == $sbname || 'orphaned_widgets' == substr( $sbname, 0, 16 ) ) {
- echo ' ';
- } else {
- if ( ! isset( $sidebars_widgets[ $sbname ] ) || ! is_array( $sidebars_widgets[ $sbname ] ) ) {
- $j = 1;
- $sidebars_widgets[ $sbname ] = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ foreach ( $wp_registered_sidebars as $sbname => $sbvalue ) {
+ echo "\t\t<tr><td><label><input type='radio' name='sidebar' value='" . esc_attr( $sbname ) . "'" . checked( $sbname, $sidebar, false ) . " /> $sbvalue[name]</label></td><td>";
+ if ( 'wp_inactive_widgets' == $sbname || 'orphaned_widgets' == substr( $sbname, 0, 16 ) ) {
+ echo ' ';
</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">- $j = count( $sidebars_widgets[ $sbname ] );
- if ( isset( $_GET['addnew'] ) || ! in_array( $widget_id, $sidebars_widgets[ $sbname ], true ) ) {
- $j++;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $sidebars_widgets[ $sbname ] ) || ! is_array( $sidebars_widgets[ $sbname ] ) ) {
+ $j = 1;
+ $sidebars_widgets[ $sbname ] = array();
+ } else {
+ $j = count( $sidebars_widgets[ $sbname ] );
+ if ( isset( $_GET['addnew'] ) || ! in_array( $widget_id, $sidebars_widgets[ $sbname ], true ) ) {
+ $j++;
+ }
</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 = '';
- echo "\t\t<select name='{$sbname}_position'>\n";
- echo "\t\t<option value=''>" . __( '— Select —' ) . "</option>\n";
- for ( $i = 1; $i <= $j; $i++ ) {
- if ( in_array( $widget_id, $sidebars_widgets[ $sbname ], true ) ) {
- $selected = selected( $i, $key + 1, false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $selected = '';
+ echo "\t\t<select name='{$sbname}_position'>\n";
+ echo "\t\t<option value=''>" . __( '— Select —' ) . "</option>\n";
+ for ( $i = 1; $i <= $j; $i++ ) {
+ if ( in_array( $widget_id, $sidebars_widgets[ $sbname ], true ) ) {
+ $selected = selected( $i, $key + 1, false );
+ }
+ echo "\t\t<option value='$i'$selected> $i </option>\n";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "\t\t<option value='$i'$selected> $i </option>\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo "\t\t</select>\n";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "\t\t</select>\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo "</td></tr>\n";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "</td></tr>\n";
-}
</del><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </tbody></table>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="widget-control-actions">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-if ( isset( $_GET['addnew'] ) ) {
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( isset( $_GET['addnew'] ) ) {
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a href="widgets.php" class="button alignleft"><?php _e( 'Cancel' ); ?></a>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-} else {
- submit_button( __( 'Delete' ), 'alignleft', 'removewidget', false );
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ } else {
+ submit_button( __( 'Delete' ), 'alignleft', 'removewidget', false );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> submit_button( __( 'Save Widget' ), 'primary alignright', 'savewidget', false );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="widget-id" class="widget-id" value="<?php echo esc_attr( $widget_id ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr( $id_base ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr( $multi_number ); ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php wp_nonce_field( "save-delete-widget-$widget_id" ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( "save-delete-widget-$widget_id" ); ?>
</ins><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="cx" style="display: block; padding: 0 10px"> </form>
</span><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">-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><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><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpcommentspostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-comments-post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-comments-post.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-comments-post.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data = intval( $comment->get_error_data() );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $data ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . $comment->get_error_message() . '</p>', __( 'Comment Submission Failure' ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . $comment->get_error_message() . '</p>',
+ __( 'Comment Submission Failure' ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'response' => $data,
</span><span class="cx" style="display: block; padding: 0 10px"> 'back_link' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 = wp_get_current_user();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$user = wp_get_current_user();
</ins><span class="cx" style="display: block; padding: 0 10px"> $cookies_consent = ( isset( $_POST['wp-comment-cookies-consent'] ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyeleven404php"></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/404.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/404.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/404.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'number' => 10,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,10 +45,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %1$s: smilie */
</span><span class="cx" style="display: block; padding: 0 10px"> $archive_content = '<p>' . sprintf( __( 'Try looking in the monthly archives. %1$s', 'twentyeleven' ), convert_smilies( ':)' ) ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> the_widget(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'WP_Widget_Archives', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'WP_Widget_Archives',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'count' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'dropdown' => 1,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), array( 'after_title' => '</h2>' . $archive_content )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array( 'after_title' => '</h2>' . $archive_content )
</ins><span class="cx" style="display: block; 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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/archive.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><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><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">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* Include the Post-Format-specific template for the content.
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/author.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // If a user has filled out their description, show a bio on their entries.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_the_author_meta( 'description' ) ) :
</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"> <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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,7 +68,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><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><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">
</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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/category.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><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><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">
</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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/comments.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php if ( post_password_required() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'twentyeleven' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #comments -->
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Stop the rest of comments.php from being processed,
</span><span class="cx" style="display: block; padding: 0 10px"> * but don't kill the script entirely -- we still have
</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"> return;
</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">- ?>
</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"> <?php // You can start editing here -- including this comment! ?>
</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,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> _n( 'One thought on “%2$s”', '%1$s thoughts on “%2$s”', get_comments_number(), 'twentyeleven' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ number_format_i18n( get_comments_number() ),
+ '<span>' . get_the_title() . '</span>'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </h2>
</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"> * 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><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"> <p class="nocomments"><?php _e( 'Comments are closed.', 'twentyeleven' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/content-aside.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'after' => '</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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevencontentfeaturedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/content-featured.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/content-featured.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/content-featured.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'after' => '</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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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"> <footer class="entry-meta">
</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"> esc_url( get_permalink() ),
</span><span class="cx" style="display: block; padding: 0 10px"> the_title_attribute( 'echo=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">- ?>
</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"> <?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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/content-gallery.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,28 +32,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( post_password_required() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyeleven' ) ); ?>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> else :
</span><span class="cx" style="display: block; padding: 0 10px"> $images = twentyeleven_get_gallery_images();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $images ) :
</span><span class="cx" style="display: block; padding: 0 10px"> $total_images = count( $images );
</span><span class="cx" style="display: block; padding: 0 10px"> $image = reset( $images );
</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"> <figure class="gallery-thumb">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php the_permalink(); ?>"><?php echo wp_get_attachment_image( $image, 'thumbnail' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> </figure><!-- .gallery-thumb -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><em>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- printf(
- _n( 'This gallery contains <a %1$s>%2$s photo</a>.', 'This gallery contains <a %1$s>%2$s photos</a>.', $total_images, 'twentyeleven' ),
- 'href="' . esc_url( get_permalink() ) . '" title="' . esc_attr( sprintf( __( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) ) . '" rel="bookmark"',
- number_format_i18n( $total_images )
- );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ printf(
+ _n( 'This gallery contains <a %1$s>%2$s photo</a>.', 'This gallery contains <a %1$s>%2$s photos</a>.', $total_images, 'twentyeleven' ),
+ 'href="' . esc_url( get_permalink() ) . '" title="' . esc_attr( sprintf( __( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) ) . '" rel="bookmark"',
+ number_format_i18n( $total_images )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </em></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // end twentyeleven_get_gallery_images() check ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php the_excerpt(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php the_excerpt(); ?>
</ins><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="cx" style="display: block; padding: 0 10px"> wp_link_pages(
</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"> 'after' => '</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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,11 +72,11 @@
</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="cx" style="display: block; padding: 0 10px"> if ( $categories_list ) :
</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"> <span class="cat-links">
</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
</ins><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $show_sep = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $show_sep = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // End if categories ?>
</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"> $tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $tags_list ) :
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $show_sep ) :
</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"> <span class="sep"> | </span>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // End if $show_sep ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="tag-links">
</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"> <?php endif; // End if $tags_list ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( comments_open() ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $show_sep ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $show_sep ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="sep"> | </span>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // End if $show_sep ?>
</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></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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/content-image.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'after' => '</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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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"> <footer class="entry-meta">
</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"> esc_attr( sprintf( __( 'View all posts by %s', 'twentyeleven' ), get_the_author() ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> get_the_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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-meta -->
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,9 +56,9 @@
</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="cx" style="display: block; padding: 0 10px"> if ( $categories_list ) :
</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"> <span class="cat-links">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // End if categories ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevencontentintrophp"></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-intro.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/content-intro.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/content-intro.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'after' => '</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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- #post-<?php the_ID(); ?> -->
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/content-link.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'after' => '</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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevencontentpagephp"></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-page.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/content-page.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/content-page.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'after' => '</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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</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 edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/content-quote.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'after' => '</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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,11 +50,11 @@
</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="cx" style="display: block; padding: 0 10px"> if ( $categories_list ) :
</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"> <span class="cat-links">
</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
</ins><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $show_sep = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $show_sep = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // End if categories ?>
</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"> $tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $tags_list ) :
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $show_sep ) :
</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"> <span class="sep"> | </span>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // End if $show_sep ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="tag-links">
</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"> <?php endif; // End if $tags_list ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( comments_open() ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $show_sep ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $show_sep ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="sep"> | </span>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // End if $show_sep ?>
</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></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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/content-single.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'after' => '</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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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"> <footer class="entry-meta">
</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"> get_the_author(),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( get_author_posts_url( get_the_author_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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php 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 ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/content-status.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'after' => '</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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/content.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'after' => '</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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,39 +53,39 @@
</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><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_object_in_taxonomy( get_post_type(), 'category' ) ) : // Hide category text when not supported ?>
</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
</ins><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $categories_list ) :
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $categories_list ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="cat-links">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list );
- $show_sep = true;
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list );
+ $show_sep = true;
+ ?>
</ins><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 endif; // End if is_object_in_taxonomy( get_post_type(), 'category' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_object_in_taxonomy( get_post_type(), 'post_tag' ) ) : // Hide tag text when not supported ?>
</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
</ins><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $tags_list ) :
- if ( $show_sep ) :
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $tags_list ) :
+ if ( $show_sep ) :
+ ?>
</ins><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list );
- $show_sep = true;
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list );
+ $show_sep = true;
+ ?>
</ins><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"> <?php endif; // End if is_object_in_taxonomy( get_post_type(), 'post_tag' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( comments_open() ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $show_sep ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $show_sep ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="sep"> | </span>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // End if $show_sep ?>
</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></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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/functions.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +107,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add support for custom backgrounds.
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'custom-background', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'custom-background',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Let WordPress know what our default background color is.
</span><span class="cx" style="display: block; padding: 0 10px"> * This is dependent on our current color scheme.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -258,7 +259,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // Has the text been hidden?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'blank' == $text_color ) :
</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"> #site-title,
</span><span class="cx" style="display: block; padding: 0 10px"> #site-description {
</span><span class="cx" style="display: block; padding: 0 10px"> position: absolute;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,10 +266,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- // 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">+ <?php
+ // 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><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"> #site-title a,
</span><span class="cx" style="display: block; padding: 0 10px"> #site-description {
</span><span class="cx" style="display: block; padding: 0 10px"> color: #<?php echo $text_color; ?>;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,7 +276,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </style>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // twentyeleven_header_style
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,7 +289,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"> function twentyeleven_admin_header_style() {
</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"> <style type="text/css" id="twentyeleven-admin-header-css">
</span><span class="cx" style="display: block; padding: 0 10px"> .appearance_page_custom-header #headimg {
</span><span class="cx" style="display: block; padding: 0 10px"> border: none;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,10 +311,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 23px;
</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><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
</ins><span class="cx" style="display: block; padding: 0 10px"> // If the user has set a custom color for the text use that
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_header_textcolor() != HEADER_TEXTCOLOR ) :
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_header_textcolor() != HEADER_TEXTCOLOR ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> #site-title a,
</span><span class="cx" style="display: block; padding: 0 10px"> #site-description {
</span><span class="cx" style="display: block; padding: 0 10px"> color: #<?php echo get_header_textcolor(); ?>;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -325,7 +326,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> width: 100%;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> </style>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // 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">@@ -339,7 +340,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyeleven_admin_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">-?>
</del><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="headimg">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $color = get_header_textcolor();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -355,7 +356,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <img src="<?php echo esc_url( $image ); ?>" alt="" />
</span><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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // 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">@@ -529,13 +530,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_query;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_query->max_num_pages > 1 ) :
</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"> <nav id="<?php echo esc_attr( $html_id ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3 class="assistive-text"><?php _e( 'Post navigation', 'twentyeleven' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">←</span> Older posts', 'twentyeleven' ) ); ?></div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">→</span>', 'twentyeleven' ) ); ?></div>
</span><span class="cx" style="display: block; padding: 0 10px"> </nav><!-- #nav-above -->
</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
</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"> endif; // twentyeleven_content_nav
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -636,13 +637,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $comment->comment_type ) :
</span><span class="cx" style="display: block; padding: 0 10px"> case 'pingback':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'trackback':
</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"> <li class="post pingback">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Pingback:', 'twentyeleven' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?></p>
</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
</ins><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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <article id="comment-<?php comment_ID(); ?>" class="comment">
</span><span class="cx" style="display: block; padding: 0 10px"> <footer class="comment-meta">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -667,7 +668,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( __( '%1$s at %2$s', 'twentyeleven' ), get_comment_date(), get_comment_time() )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .comment-author .vcard -->
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -685,7 +686,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> comment_reply_link(
</span><span class="cx" style="display: block; padding: 0 10px"> array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'reply_text' => __( 'Reply <span>↓</span>', 'twentyeleven' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'depth' => $depth,
</span><span class="cx" style="display: block; padding: 0 10px"> 'max_depth' => $args['max_depth'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -692,11 +694,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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .reply -->
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- #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">- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><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></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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/header.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> echo esc_html( ' | ' . sprintf( __( 'Page %s', 'twentyeleven' ), max( $paged, $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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </title>
</span><span class="cx" style="display: block; padding: 0 10px"> <link rel="profile" href="http://gmpg.org/xfn/11" />
</span><span class="cx" style="display: block; padding: 0 10px"> <link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,14 +128,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $header_image ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $header_image_class = ' with-image';
</span><span 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"> <div class="only-search<?php echo $header_image_class; ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php get_search_form(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php get_search_form(); ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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">- ?>
- <?php get_search_form(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ <?php get_search_form(); ?>
</ins><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"> <nav id="access" role="navigation">
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/image.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,43 +51,43 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-attachment">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="attachment">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
- /*
- * Grab the IDs of all the image attachments in a gallery so we can get the URL of the next adjacent image in a gallery,
- * or the first image (if we're looking at the last image in a gallery), or, in a gallery of one, just the link to that image file
- */
- $attachments = array_values(
- get_children(
- array(
- 'post_parent' => $post->post_parent,
- 'post_status' => 'inherit',
- 'post_type' => 'attachment',
- 'post_mime_type' => 'image',
- 'order' => 'ASC',
- 'orderby' => 'menu_order ID',
- )
- )
- );
-foreach ( $attachments as $k => $attachment ) {
- if ( $attachment->ID == $post->ID ) {
- break;
- }
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /*
+ * Grab the IDs of all the image attachments in a gallery so we can get the URL of the next adjacent image in a gallery,
+ * or the first image (if we're looking at the last image in a gallery), or, in a gallery of one, just the link to that image file
+ */
+ $attachments = array_values(
+ get_children(
+ array(
+ 'post_parent' => $post->post_parent,
+ 'post_status' => 'inherit',
+ 'post_type' => 'attachment',
+ 'post_mime_type' => 'image',
+ 'order' => 'ASC',
+ 'orderby' => 'menu_order ID',
+ )
+ )
+ );
+ foreach ( $attachments as $k => $attachment ) {
+ if ( $attachment->ID == $post->ID ) {
+ break;
+ }
+ }
</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
-if ( count( $attachments ) > 1 ) {
- $k++;
- if ( isset( $attachments[ $k ] ) ) {
- // get the URL of the next image attachment
- $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
- } else { // or get the URL of the first image attachment
- $next_attachment_url = get_attachment_link( $attachments[0]->ID );
- }
-} else {
- // or, if there's only 1 image, get the URL of the image
- $next_attachment_url = wp_get_attachment_url();
-}
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If there is more than 1 attachment in a gallery
+ if ( count( $attachments ) > 1 ) {
+ $k++;
+ if ( isset( $attachments[ $k ] ) ) {
+ // get the URL of the next image attachment
+ $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
+ } else { // or get the URL of the first image attachment
+ $next_attachment_url = get_attachment_link( $attachments[0]->ID );
+ }
+ } else {
+ // or, if there's only 1 image, get the URL of the image
+ $next_attachment_url = wp_get_attachment_url();
+ }
+ ?>
</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><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">@@ -99,7 +99,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_size = apply_filters( 'twentyeleven_attachment_size', 848 );
</span><span class="cx" style="display: block; padding: 0 10px"> echo wp_get_attachment_image( $post->ID, array( $attachment_size, 1024 ) ); // filterable image width with 1024px limit for image height.
</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"> </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">@@ -120,7 +120,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'after' => '</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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-description -->
</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></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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> $options = twentyeleven_get_theme_options();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( twentyeleven_color_schemes() as $scheme ) {
</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"> <div class="layout image-radio-option color-scheme">
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="description">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="radio" name="twentyeleven_theme_options[color_scheme]" value="<?php echo esc_attr( $scheme['value'] ); ?>" <?php checked( $options['color_scheme'], $scheme['value'] ); ?> />
</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><span class="cx" style="display: block; padding: 0 10px"> </label>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -438,7 +438,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $default_options['link_color'] == $link_color ) {
</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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <style>
</span><span class="cx" style="display: block; padding: 0 10px"> /* Link color */
</span><span class="cx" style="display: block; padding: 0 10px"> a,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,7 +466,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> background-color: <?php echo $link_color; ?>;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> </style>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', 'twentyeleven_print_link_color_style' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -523,7 +523,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $wp_customize->selective_refresh ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->selective_refresh->add_partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blogname', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blogname',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'selector' => '#site-title a',
</span><span class="cx" style="display: block; padding: 0 10px"> 'container_inclusive' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'render_callback' => 'twentyeleven_customize_partial_blogname',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -530,7 +531,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"> $wp_customize->selective_refresh->add_partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blogdescription', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blogdescription',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'selector' => '#site-description',
</span><span class="cx" style="display: block; padding: 0 10px"> 'container_inclusive' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'render_callback' => 'twentyeleven_customize_partial_blogdescription',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -542,7 +544,8 @@
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'twentyeleven_theme_options[color_scheme]', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'twentyeleven_theme_options[color_scheme]',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => $defaults['color_scheme'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'edit_theme_options',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -556,7 +559,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"> $wp_customize->add_control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'twentyeleven_color_scheme', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'twentyeleven_color_scheme',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Color Scheme', 'twentyeleven' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'colors',
</span><span class="cx" style="display: block; padding: 0 10px"> 'settings' => 'twentyeleven_theme_options[color_scheme]',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -568,7 +572,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Link Color (added to Color Scheme section in Customizer)
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'twentyeleven_theme_options[link_color]', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'twentyeleven_theme_options[link_color]',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => twentyeleven_get_default_link_color( $options['color_scheme'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'sanitize_hex_color',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -578,7 +583,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_control(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Color_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_customize, 'link_color', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_customize,
+ 'link_color',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Link Color', 'twentyeleven' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'colors',
</span><span class="cx" style="display: block; padding: 0 10px"> 'settings' => 'twentyeleven_theme_options[link_color]',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -588,7 +595,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Default Layout
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_section(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'twentyeleven_layout', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'twentyeleven_layout',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Layout', 'twentyeleven' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 50,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -595,7 +603,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"> $wp_customize->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'twentyeleven_theme_options[theme_layout]', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'twentyeleven_theme_options[theme_layout]',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => $defaults['theme_layout'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'sanitize_key',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -609,7 +618,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"> $wp_customize->add_control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'twentyeleven_theme_options[theme_layout]', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'twentyeleven_theme_options[theme_layout]',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'twentyeleven_layout',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'radio',
</span><span class="cx" style="display: block; padding: 0 10px"> 'choices' => $choices,
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/inc/widgets.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function __construct() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::__construct(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'widget_twentyeleven_ephemera', __( 'Twenty Eleven Ephemera', 'twentyeleven' ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'widget_twentyeleven_ephemera',
+ __( 'Twenty Eleven Ephemera', 'twentyeleven' ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'classname' => 'widget_twentyeleven_ephemera',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Use this widget to list your recent Aside, Status, Quote, and Link posts', 'twentyeleven' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'customize_selective_refresh' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> while ( $ephemera->have_posts() ) :
</span><span class="cx" style="display: block; padding: 0 10px"> $ephemera->the_post();
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( 'link' != get_post_format() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +190,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function form( $instance ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $title = isset( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $number = isset( $instance['number'] ) ? absint( $instance['number'] ) : 10;
</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"> <p><label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title:', 'twentyeleven' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/index.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><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><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">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php get_template_part( 'content', get_post_format() ); ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/page.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><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><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">
</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></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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/search.php 2018-08-17 01:50:26 UTC (rev 43571)
</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
</span><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><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">
</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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/showcase.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,15 +28,15 @@
</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">- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * We are using a heading by rendering the_content
</span><span class="cx" style="display: block; padding: 0 10px"> * If we have content for this page, let's display it.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' != get_the_content() ) {
- get_template_part( 'content', 'intro' );
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' != get_the_content() ) {
+ get_template_part( 'content', 'intro' );
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,88 +77,88 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</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><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">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="featured-posts">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="showcase-heading"><?php _e( 'Featured Post', 'twentyeleven' ); ?></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
- // Let's roll.
- while ( $featured->have_posts() ) :
- $featured->the_post();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ // Let's roll.
+ while ( $featured->have_posts() ) :
+ $featured->the_post();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Increase the counter.
- $counter_slider++;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Increase the counter.
+ $counter_slider++;
</ins><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.
- */
- $feature_class = 'feature-text';
</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'll have the feature-text class.
+ */
+ $feature_class = 'feature-text';
</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 ( has_post_thumbnail() ) {
- // ... but if it has a featured image let's add some class
- $feature_class = 'feature-image small';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( has_post_thumbnail() ) {
+ // ... but if it has a featured image let's add some class
+ $feature_class = 'feature-image small';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Hang on. Let's check this here image out.
- $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), array( $header_image_width, $header_image_width ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Hang on. Let's check this here image out.
+ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), array( $header_image_width, $header_image_width ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Is it bigger than or equal to our header?
- if ( $image[1] >= $header_image_width ) {
- // If bigger, let's add a BIGGER class. It's EXTRA classy now.
- $feature_class = 'feature-image large';
- }
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Is it bigger than or equal to our header?
+ if ( $image[1] >= $header_image_width ) {
+ // If bigger, let's add a BIGGER class. It's EXTRA classy now.
+ $feature_class = 'feature-image large';
+ }
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <section class="featured-post <?php echo esc_attr( $feature_class ); ?>" id="featured-post-<?php echo esc_attr( $counter_slider ); ?>">
</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 the thumbnail is as big as the header image
- * make it a large featured post, otherwise render it small
- */
- if ( has_post_thumbnail() ) {
- if ( $image[1] >= $header_image_width ) {
- $thumbnail_size = 'large-feature';
- } else {
- $thumbnail_size = 'small-feature';
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /*
+ * If the thumbnail is as big as the header image
+ * make it a large featured post, otherwise render it small
+ */
+ if ( has_post_thumbnail() ) {
+ if ( $image[1] >= $header_image_width ) {
+ $thumbnail_size = 'large-feature';
+ } else {
+ $thumbnail_size = 'small-feature';
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php the_post_thumbnail( $thumbnail_size ); ?></a>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- }
- ?>
- <?php get_template_part( 'content', 'featured' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ }
+ ?>
+ <?php get_template_part( 'content', 'featured' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </section>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php endwhile; ?>
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- // Show slider only if we have more than one featured post.
- if ( $featured->post_count > 1 ) :
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ // Show slider only if we have more than one featured post.
+ if ( $featured->post_count > 1 ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <nav class="feature-slider">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?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">- // Reset the counter so that we end up with matching elements
- $counter_slider = 0;
</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
+ $counter_slider = 0;
</ins><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
- rewind_posts();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Begin from zero
+ rewind_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">- // Let's roll again.
- while ( $featured->have_posts() ) :
- $featured->the_post();
- $counter_slider++;
- if ( 1 == $counter_slider ) {
- $class = ' class="active"';
- } else {
- $class = '';
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Let's roll again.
+ while ( $featured->have_posts() ) :
+ $featured->the_post();
+ $counter_slider++;
+ if ( 1 == $counter_slider ) {
+ $class = ' class="active"';
+ } else {
+ $class = '';
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <li><a href="#featured-post-<?php echo esc_attr( $counter_slider ); ?>" title="<?php echo esc_attr( sprintf( __( 'Featuring: %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) ); ?>"<?php echo $class; ?>></a></li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php endwhile; ?>
</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"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> </nav>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // End check for more than one sticky post. ?>
</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"> // For all other recent posts, just display the title and comment status.
</span><span class="cx" style="display: block; padding: 0 10px"> while ( $recent->have_posts() ) :
</span><span class="cx" style="display: block; padding: 0 10px"> $recent->the_post();
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="entry-title">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -215,7 +215,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </span>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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"> // If we had some posts, close the <ol>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,7 +230,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"> the_widget(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Twenty_Eleven_Ephemera_Widget', '', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Twenty_Eleven_Ephemera_Widget',
+ '',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h3 class="widget-title">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_title' => '</h3>',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/sidebar-page.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><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><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">
</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></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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/sidebar.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> $current_layout = $options['theme_layout'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'content' != $current_layout ) :
</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"> <div id="secondary" class="widget-area" role="complementary">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! dynamic_sidebar( 'sidebar-1' ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/single.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><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><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">
</span><span class="cx" style="display: block; padding: 0 10px"> <nav id="nav-single">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3 class="assistive-text"><?php _e( 'Post navigation', 'twentyeleven' ); ?></h3>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyeleven/tag.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><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><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">
</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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfifteen/comments.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // If comments are closed and there are comments, let's leave a little note, shall we?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
</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"> <p class="no-comments"><?php _e( 'Comments are closed.', 'twentyfifteen' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfifteen/content-link.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> else :
</span><span class="cx" style="display: block; padding: 0 10px"> the_title( sprintf( '<h2 class="entry-title"><a href="%s">', esc_url( twentyfifteen_get_link_url() ) ), '</a></h2>' );
</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </header>
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- .entry-header -->
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> 'separator' => '<span class="screen-reader-text">, </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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfifteencontentpagephp"></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-page.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/content-page.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfifteen/content-page.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'separator' => '<span class="screen-reader-text">, </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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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 edit_post_link( __( 'Edit', 'twentyfifteen' ), '<footer class="entry-footer"><span class="edit-link">', '</span></footer><!-- .entry-footer -->' ); ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfifteen/content.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> else :
</span><span class="cx" style="display: block; padding: 0 10px"> the_title( sprintf( '<h2 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h2>' );
</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </header><!-- .entry-header -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</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"> 'separator' => '<span class="screen-reader-text">, </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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfifteen/functions.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +93,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * to output valid HTML5.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'html5', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'html5',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'search-form',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment-form',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment-list',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +109,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * See: https://codex.wordpress.org/Post_Formats
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post-formats', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post-formats',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'aside',
</span><span class="cx" style="display: block; padding: 0 10px"> 'image',
</span><span class="cx" style="display: block; padding: 0 10px"> 'video',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,7 +129,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fifteen 1.5
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'custom-logo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'custom-logo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'height' => 248,
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 248,
</span><span class="cx" style="display: block; padding: 0 10px"> 'flex-height' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,8 +155,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"> add_theme_support(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'custom-background', apply_filters(
- 'twentyfifteen_custom_background_args', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'custom-background',
+ apply_filters(
+ 'twentyfifteen_custom_background_args',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default-color' => $default_color,
</span><span class="cx" style="display: block; padding: 0 10px"> 'default-attachment' => 'fixed',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,7 +257,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'family' => urlencode( implode( '|', $fonts ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'subset' => urlencode( $subsets ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'https://fonts.googleapis.com/css'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'https://fonts.googleapis.com/css'
</ins><span class="cx" style="display: block; 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">@@ -307,7 +313,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'twentyfifteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20150330', true );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'twentyfifteen-script', 'screenReaderText', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'twentyfifteen-script',
+ 'screenReaderText',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'expand' => '<span class="screen-reader-text">' . __( 'expand child menu', 'twentyfifteen' ) . '</span>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'collapse' => '<span class="screen-reader-text">' . __( 'collapse child menu', 'twentyfifteen' ) . '</span>',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfifteenheaderphp"></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/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/header.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfifteen/header.php 2018-08-17 01:50:26 UTC (rev 43571)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> $description = get_bloginfo( 'description', 'display' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $description || is_customize_preview() ) :
</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"> <p class="site-description"><?php echo $description; ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <button class="secondary-toggle"><?php _e( 'Menu and widgets', 'twentyfifteen' ); ?></button>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .site-branding -->
</span><span class="cx" style="display: block; padding: 0 10px"> </header><!-- .site-header -->
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfifteen/image.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> // Start the loop.
</span><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><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">
</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">
</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"> 'separator' => '<span class="screen-reader-text">, </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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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"> <footer class="entry-footer">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfifteenincbackcompatphp"></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/back-compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/inc/back-compat.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfifteen/inc/back-compat.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,7 +45,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfifteen_customize() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( __( 'Twenty Fifteen requires at least WordPress version 4.1. You are running version %s. Please upgrade and try again.', 'twentyfifteen' ), $GLOBALS['wp_version'] ), '', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sprintf( __( 'Twenty Fifteen requires at least WordPress version 4.1. You are running version %s. Please upgrade and try again.', 'twentyfifteen' ), $GLOBALS['wp_version'] ),
+ '',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'back_link' => 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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfifteen/inc/custom-header.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,8 +32,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"> add_theme_support(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'custom-header', apply_filters(
- 'twentyfifteen_custom_header_args', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'custom-header',
+ apply_filters(
+ 'twentyfifteen_custom_header_args',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default-text-color' => $default_text_color,
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 954,
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => 1300,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,7 +99,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // Short header for when there is no Custom Header and Header Text is hidden.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $header_image ) && ! display_header_text() ) :
</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"> .site-header {
</span><span class="cx" style="display: block; padding: 0 10px"> padding-top: 14px;
</span><span class="cx" style="display: block; padding: 0 10px"> padding-bottom: 14px;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,12 +136,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> min-height: 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">- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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"> // Has a Custom Header been added?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $header_image ) ) :
</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"> .site-header {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,12 +178,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> background: transparent;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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"> // Has the text been hidden?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! display_header_text() ) :
</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"> .site-title,
</span><span class="cx" style="display: block; padding: 0 10px"> .site-description {
</span><span class="cx" style="display: block; padding: 0 10px"> clip: rect(1px, 1px, 1px, 1px);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +191,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </style>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // twentyfifteen_header_style
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfifteen/inc/customizer.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $wp_customize->selective_refresh ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->selective_refresh->add_partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blogname', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blogname',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'selector' => '.site-title a',
</span><span class="cx" style="display: block; padding: 0 10px"> 'container_inclusive' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'render_callback' => 'twentyfifteen_customize_partial_blogname',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +30,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"> $wp_customize->selective_refresh->add_partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blogdescription', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blogdescription',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'selector' => '.site-description',
</span><span class="cx" style="display: block; padding: 0 10px"> 'container_inclusive' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'render_callback' => 'twentyfifteen_customize_partial_blogdescription',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +41,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add color scheme setting and control.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'color_scheme', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'color_scheme',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => 'default',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'twentyfifteen_sanitize_color_scheme',
</span><span class="cx" style="display: block; padding: 0 10px"> 'transport' => 'postMessage',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,7 +50,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"> $wp_customize->add_control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'color_scheme', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'color_scheme',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Base Color Scheme', 'twentyfifteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'colors',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'select',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +62,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add custom header and sidebar text color setting and control.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'sidebar_textcolor', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'sidebar_textcolor',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => $color_scheme[4],
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'sanitize_hex_color',
</span><span class="cx" style="display: block; padding: 0 10px"> 'transport' => 'postMessage',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +72,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_control(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Color_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_customize, 'sidebar_textcolor', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_customize,
+ 'sidebar_textcolor',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Header and Sidebar Text Color', 'twentyfifteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'colors',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +87,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add custom header and sidebar background color setting and control.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'header_background_color', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'header_background_color',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => $color_scheme[1],
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'sanitize_hex_color',
</span><span class="cx" style="display: block; padding: 0 10px"> 'transport' => 'postMessage',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +97,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_control(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Color_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_customize, 'header_background_color', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_customize,
+ 'header_background_color',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Header and Sidebar Background Color', 'twentyfifteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'colors',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,7 +176,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"> return apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'twentyfifteen_color_schemes', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'twentyfifteen_color_schemes',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Default', 'twentyfifteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'colors' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -371,7 +382,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfifteen_get_color_scheme_css( $colors ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $colors = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $colors, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $colors,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'background_color' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'header_background_color' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'box_background_color' => '',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfifteen/inc/template-tags.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> function twentyfifteen_comment_nav() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Are there comments to navigate through?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) :
</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"> <nav class="navigation comment-navigation" role="navigation">
</span><span class="cx" style="display: block; padding: 0 10px"> <h2 class="screen-reader-text"><?php _e( 'Comment navigation', 'twentyfifteen' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="nav-links">
</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"> </div><!-- .nav-links -->
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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"> endif;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,10 +195,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 ( is_singular() ) :
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="post-thumbnail">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php the_post_thumbnail(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php the_post_thumbnail(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .post-thumbnail -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfifteensearchphp"></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/search.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/search.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfifteen/search.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> // Start the loop.
</span><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><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">
</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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/archive.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,21 +40,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _e( 'Archives', 'twentyfourteen' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </h1>
</span><span class="cx" style="display: block; padding: 0 10px"> </header><!-- .page-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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> // Start the Loop.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while ( have_posts() ) :
- the_post();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while ( have_posts() ) :
+ the_post();
</ins><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
- * (where ___ is the post format) and that will be used instead.
- */
- get_template_part( 'content', get_post_format() );
</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.
+ */
+ get_template_part( 'content', get_post_format() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> endwhile;
</span><span class="cx" style="display: block; padding: 0 10px"> // Previous/next page navigation.
</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"> get_template_part( 'content', 'none' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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 class="cx" style="display: block; padding: 0 10px">
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/author.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Since we called the_post() above, we need to rewind
</span><span class="cx" style="display: block; padding: 0 10px"> * the loop back to the beginning that way we can run
</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"> rewind_posts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Start the Loop.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while ( have_posts() ) :
- the_post();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while ( have_posts() ) :
+ the_post();
</ins><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
- * (where ___ is the post format) and that will be used instead.
- */
- get_template_part( 'content', get_post_format() );
</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.
+ */
+ get_template_part( 'content', get_post_format() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> endwhile;
</span><span class="cx" style="display: block; padding: 0 10px"> // Previous/next page navigation.
</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"> get_template_part( 'content', 'none' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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">- ?>
</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"> </div><!-- #content -->
</span><span class="cx" style="display: block; padding: 0 10px"> </section><!-- #primary -->
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/category.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,17 +28,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> // Start the Loop.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while ( have_posts() ) :
- the_post();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while ( have_posts() ) :
+ the_post();
</ins><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
- * (where ___ is the post format) and that will be used instead.
- */
- get_template_part( 'content', get_post_format() );
</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.
+ */
+ get_template_part( 'content', get_post_format() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> endwhile;
</span><span class="cx" style="display: block; padding: 0 10px"> // Previous/next page navigation.
</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"> get_template_part( 'content', 'none' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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 class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencommentsphp"></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/comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/comments.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/comments.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> </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' ) ) : ?>
</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' ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <nav id="comment-nav-above" class="navigation comment-navigation" role="navigation">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="screen-reader-text"><?php _e( 'Comment navigation', 'twentyfourteen' ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="nav-previous"><?php previous_comments_link( __( '← Older Comments', 'twentyfourteen' ) ); ?></div>
</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"> </ol><!-- .comment-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">- <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : ?>
</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' ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <nav id="comment-nav-below" class="navigation comment-navigation" role="navigation">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="screen-reader-text"><?php _e( 'Comment navigation', 'twentyfourteen' ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="nav-previous"><?php previous_comments_link( __( '← Older Comments', 'twentyfourteen' ) ); ?></div>
</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"> </nav><!-- #comment-nav-below -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // Check for comment navigation. ?>
</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 ( ! comments_open() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! comments_open() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="no-comments"><?php _e( 'Comments are closed.', 'twentyfourteen' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentasidephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/content-aside.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/content-aside.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/content-aside.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-meta -->
</span><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
</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"> if ( is_single() ) :
</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"> else :
</span><span class="cx" style="display: block; padding: 0 10px"> the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
</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">- ?>
</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"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="post-format">
</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"> 'link_after' => '</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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 the_tags( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' ); ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentaudiophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/content-audio.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/content-audio.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/content-audio.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-meta -->
</span><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
</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"> if ( is_single() ) :
</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"> else :
</span><span class="cx" style="display: block; padding: 0 10px"> the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
</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">- ?>
</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"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="post-format">
</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"> 'link_after' => '</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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 the_tags( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' ); ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentgalleryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/content-gallery.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/content-gallery.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/content-gallery.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-meta -->
</span><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
</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"> if ( is_single() ) :
</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"> else :
</span><span class="cx" style="display: block; padding: 0 10px"> the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
</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">- ?>
</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"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="post-format">
</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"> 'link_after' => '</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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 the_tags( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' ); ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentimagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/content-image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/content-image.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/content-image.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-meta -->
</span><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
</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"> if ( is_single() ) :
</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"> else :
</span><span class="cx" style="display: block; padding: 0 10px"> the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
</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">- ?>
</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"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="post-format">
</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"> 'link_after' => '</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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 the_tags( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' ); ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentlinkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/content-link.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/content-link.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/content-link.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-meta -->
</span><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
</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"> if ( is_single() ) :
</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"> else :
</span><span class="cx" style="display: block; padding: 0 10px"> the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
</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">- ?>
</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"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="post-format">
</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"> 'link_after' => '</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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 the_tags( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' ); ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentpagephp"></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-page.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/content-page.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/content-page.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,6 +28,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' );
</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"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- #post-## -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentquotephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/content-quote.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/content-quote.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/content-quote.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-meta -->
</span><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
</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"> if ( is_single() ) :
</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"> else :
</span><span class="cx" style="display: block; padding: 0 10px"> the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
</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">- ?>
</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"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="post-format">
</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"> 'link_after' => '</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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 the_tags( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' ); ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentvideophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/content-video.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/content-video.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/content-video.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-meta -->
</span><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
</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"> if ( is_single() ) :
</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"> else :
</span><span class="cx" style="display: block; padding: 0 10px"> the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
</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">- ?>
</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"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="post-format">
</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"> 'link_after' => '</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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 the_tags( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' ); ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/content.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/content.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><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
</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"> if ( is_single() ) :
</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"> else :
</span><span class="cx" style="display: block; padding: 0 10px"> the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
</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">- ?>
</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"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,9 +35,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) :
</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"> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
</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
</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"> edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/functions.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * to output valid HTML5.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'html5', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'html5',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'search-form',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment-form',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment-list',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,7 +106,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * See https://codex.wordpress.org/Post_Formats
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post-formats', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post-formats',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'aside',
</span><span class="cx" style="display: block; padding: 0 10px"> 'image',
</span><span class="cx" style="display: block; padding: 0 10px"> 'video',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,8 +120,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This theme allows users to set a custom background.
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'custom-background', apply_filters(
- 'twentyfourteen_custom_background_args', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'custom-background',
+ apply_filters(
+ 'twentyfourteen_custom_background_args',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default-color' => 'f5f5f5',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,7 +131,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add support for featured content.
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'featured-content', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'featured-content',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'featured_content_filter' => 'twentyfourteen_get_featured_posts',
</span><span class="cx" style="display: block; padding: 0 10px"> 'max_posts' => 6,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,7 +291,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_front_page() && 'slider' == get_theme_mod( 'featured_content_layout' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'twentyfourteen-slider', get_template_directory_uri() . '/js/slider.js', array( 'jquery' ), '20131205', true );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'twentyfourteen-slider', 'featuredSliderDefaults', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'twentyfourteen-slider',
+ 'featuredSliderDefaults',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'prevText' => __( 'Previous', 'twentyfourteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'nextText' => __( 'Next', 'twentyfourteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -423,7 +430,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $post_count ) {
</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">- ?>
</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"> <div class="contributor">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="contributor-info">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -440,7 +447,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .contributor-info -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .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">- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> endforeach;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenheaderphp"></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/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/header.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/header.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'menu_id' => 'primary-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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </nav>
</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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/image.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> // Start the Loop.
</span><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><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"> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenincbackcompatphp"></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/back-compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/inc/back-compat.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/back-compat.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,7 +45,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfourteen_customize() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( __( 'Twenty Fourteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentyfourteen' ), $GLOBALS['wp_version'] ), '', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sprintf( __( 'Twenty Fourteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentyfourteen' ), $GLOBALS['wp_version'] ),
+ '',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'back_link' => 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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> add_theme_support(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'custom-header', apply_filters(
- 'twentyfourteen_custom_header_args', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'custom-header',
+ apply_filters(
+ 'twentyfourteen_custom_header_args',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default-text-color' => 'fff',
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 1260,
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => 240,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +73,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // Has the text been hidden?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! display_header_text() ) :
</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"> .site-title,
</span><span class="cx" style="display: block; padding: 0 10px"> .site-description {
</span><span class="cx" style="display: block; padding: 0 10px"> clip: rect(1px 1px 1px 1px); /* IE7 */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,16 +80,16 @@
</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"> position: absolute;
</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 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">+ <?php
+ // If the user has set a custom color for the text, use that.
</ins><span class="cx" style="display: block; padding: 0 10px"> elseif ( $text_color != get_theme_support( 'custom-header', 'default-text-color' ) ) :
</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"> .site-title a {
</span><span class="cx" style="display: block; padding: 0 10px"> color: #<?php echo esc_attr( $text_color ); ?>;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </style>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // twentyfourteen_header_style
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fourteen 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfourteen_admin_header_style() {
</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"> <style type="text/css" id="twentyfourteen-admin-header-css">
</span><span class="cx" style="display: block; padding: 0 10px"> .appearance_page_custom-header #headimg {
</span><span class="cx" style="display: block; padding: 0 10px"> background-color: #000;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,7 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> vertical-align: middle;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> </style>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // twentyfourteen_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">@@ -139,7 +141,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fourteen 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfourteen_admin_header_image() {
</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"> <div id="headimg">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( get_header_image() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <img src="<?php header_image(); ?>" alt="">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,6 +148,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr( sprintf( 'color: #%s;', get_header_textcolor() ) ); ?>" onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // twentyfourteen_admin_header_image
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteeninccustomizerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $wp_customize->selective_refresh ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->selective_refresh->add_partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blogname', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blogname',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'selector' => '.site-title a',
</span><span class="cx" style="display: block; padding: 0 10px"> 'container_inclusive' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'render_callback' => 'twentyfourteen_customize_partial_blogname',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +30,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"> $wp_customize->selective_refresh->add_partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blogdescription', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blogdescription',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'selector' => '.site-description',
</span><span class="cx" style="display: block; padding: 0 10px"> 'container_inclusive' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'render_callback' => 'twentyfourteen_customize_partial_blogdescription',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +56,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add the featured content section in case it's not already there.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_section(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'featured_content', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'featured_content',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Featured Content', 'twentyfourteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Use a <a href="%1$s">tag</a> to feature your posts. If no posts match the tag, <a href="%2$s">sticky posts</a> will be displayed instead.', 'twentyfourteen' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,7 +71,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add the featured content layout setting and control.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'featured_content_layout', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'featured_content_layout',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => 'grid',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'twentyfourteen_sanitize_layout',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +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"> $wp_customize->add_control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'featured_content_layout', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'featured_content_layout',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Layout', 'twentyfourteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'featured_content',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'select',
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenincfeaturedcontentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -376,7 +376,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function customize_register( $wp_customize ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_section(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'featured_content', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'featured_content',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Featured Content', 'twentyfourteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Use a <a href="%1$s">tag</a> to feature your posts. If no posts match the tag, <a href="%2$s">sticky posts</a> will be displayed instead.', 'twentyfourteen' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -390,7 +391,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add Featured Content settings.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'featured-content[tag-name]', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'featured-content[tag-name]',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => _x( 'featured', 'featured content default tag slug', 'twentyfourteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_js_callback' => array( __CLASS__, 'delete_transient' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -397,7 +399,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"> $wp_customize->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'featured-content[hide-tag]', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'featured-content[hide-tag]',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_js_callback' => array( __CLASS__, 'delete_transient' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -406,7 +409,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add Featured Content controls.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'featured-content[tag-name]', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'featured-content[tag-name]',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Tag Name', 'twentyfourteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'featured_content',
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 20,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -413,7 +417,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"> $wp_customize->add_control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'featured-content[hide-tag]', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'featured-content[hide-tag]',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Don’t display tag on front end.', 'twentyfourteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'featured_content',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'checkbox',
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteeninctemplatetagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> if ( $links ) :
</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"> <nav class="navigation paging-navigation" role="navigation">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="screen-reader-text"><?php _e( 'Posts navigation', 'twentyfourteen' ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="pagination loop-pagination">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $links; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .pagination -->
</span><span class="cx" style="display: block; padding: 0 10px"> </nav><!-- .navigation -->
</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
</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"> endif;
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_singular() ) :
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="post-thumbnail">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- if ( ( ! is_active_sidebar( 'sidebar-2' ) || is_page_template( 'page-templates/full-width.php' ) ) ) {
- the_post_thumbnail( 'twentyfourteen-full-width' );
- } else {
- the_post_thumbnail();
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( ( ! is_active_sidebar( 'sidebar-2' ) || is_page_template( 'page-templates/full-width.php' ) ) ) {
+ the_post_thumbnail( 'twentyfourteen-full-width' );
+ } else {
+ the_post_thumbnail();
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenincwidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/inc/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/inc/widgets.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/widgets.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,9 @@
</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"> parent::__construct(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'widget_twentyfourteen_ephemera', __( 'Twenty Fourteen Ephemera', 'twentyfourteen' ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'widget_twentyfourteen_ephemera',
+ __( 'Twenty Fourteen Ephemera', 'twentyfourteen' ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'classname' => 'widget_twentyfourteen_ephemera',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Use this widget to list your recent Aside, Quote, Video, Audio, Image, Gallery, and Link posts.', 'twentyfourteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'customize_selective_refresh' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,7 +142,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ephemera->the_post();
</span><span class="cx" style="display: block; padding: 0 10px"> $tmp_more = $GLOBALS['more'];
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['more'] = 0;
</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"> <li>
</span><span class="cx" style="display: block; padding: 0 10px"> <article <?php post_class(); ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,25 +183,25 @@
</span><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"> if ( ! empty( $post_thumbnail ) ) :
</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"> <a href="<?php the_permalink(); ?>"><?php echo $post_thumbnail; ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="wp-caption-text">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- printf(
- _n( 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photo</a>.', 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photos</a>.', $total_images, 'twentyfourteen' ),
- esc_url( get_permalink() ),
- number_format_i18n( $total_images )
- );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ printf(
+ _n( 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photo</a>.', 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photos</a>.', $total_images, 'twentyfourteen' ),
+ esc_url( get_permalink() ),
+ number_format_i18n( $total_images )
+ );
+ ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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"> else :
</span><span class="cx" style="display: block; padding: 0 10px"> the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyfourteen' ) );
</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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"> <header class="entry-header">
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/index.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> get_template_part( 'content', 'none' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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">- ?>
</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"> </div><!-- #content -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #primary -->
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/page-templates/contributors.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,10 +24,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Start the Loop.
</span><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><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">
</span><span class="cx" style="display: block; padding: 0 10px"> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> the_title( '<header class="entry-header"><h1 class="entry-title">', '</h1></header><!-- .entry-header -->' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Output the authors list.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,14 +34,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> twentyfourteen_list_authors();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> edit_post_link( __( 'Edit', 'twentyfourteen' ), '<footer class="entry-meta"><span class="edit-link">', '</span></footer>' );
</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"> </article><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> // If comments are open or we have at least one comment, load up the comment template.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( comments_open() || get_comments_number() ) {
- comments_template();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( comments_open() || get_comments_number() ) {
+ comments_template();
+ }
</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"> </div><!-- #content -->
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/search.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> get_template_part( 'content', 'none' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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">- ?>
</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"> </div><!-- #content -->
</span><span class="cx" style="display: block; padding: 0 10px"> </section><!-- #primary -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteensidebarphp"></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/sidebar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/sidebar.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/sidebar.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $description = get_bloginfo( 'description', 'display' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $description ) ) :
</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"> <h2 class="site-description"><?php echo esc_html( $description ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/tag.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,17 +30,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> // Start the Loop.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while ( have_posts() ) :
- the_post();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while ( have_posts() ) :
+ the_post();
</ins><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
- * (where ___ is the post format) and that will be used instead.
- */
- get_template_part( 'content', get_post_format() );
</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.
+ */
+ get_template_part( 'content', get_post_format() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> endwhile;
</span><span class="cx" style="display: block; padding: 0 10px"> // Previous/next page navigation.
</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"> get_template_part( 'content', 'none' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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 class="cx" style="display: block; padding: 0 10px">
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyfourteen/taxonomy-post_format.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,21 +51,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _e( 'Archives', 'twentyfourteen' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> // Start the Loop.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while ( have_posts() ) :
- the_post();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while ( have_posts() ) :
+ the_post();
</ins><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
- * (where ___ is the post format) and that will be used instead.
- */
- get_template_part( 'content', get_post_format() );
</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.
+ */
+ get_template_part( 'content', get_post_format() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> endwhile;
</span><span class="cx" style="display: block; padding: 0 10px"> // Previous/next page navigation.
</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"> get_template_part( 'content', 'none' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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 class="cx" style="display: block; padding: 0 10px">
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyseventeen/archive.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?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">- ?>
</del><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"> /* Start the Loop */
</span><span class="cx" style="display: block; padding: 0 10px"> while ( have_posts() ) :
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeencommentsphp"></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/comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/comments.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyseventeen/comments.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // You can start editing here -- including this comment!
</span><span class="cx" style="display: block; padding: 0 10px"> if ( have_comments() ) :
</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"> <h2 class="comments-title">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $comments_number = get_comments_number();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,10 +77,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If comments are closed and there are comments, let's leave a little note, shall we?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="no-comments"><?php _e( 'Comments are closed.', 'twentyseventeen' ); ?></p>
</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
</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"> comment_form();
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeenfooterphp"></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/footer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/footer.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyseventeen/footer.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> get_template_part( 'template-parts/footer/footer', 'widgets' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( has_nav_menu( 'social' ) ) :
</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"> <nav class="social-navigation" role="navigation" aria-label="<?php esc_attr_e( 'Footer Social Links Menu', 'twentyseventeen' ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nav_menu(
</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"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </nav><!-- .social-navigation -->
</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
</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"> get_template_part( 'template-parts/footer/site', 'info' );
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeenfrontpagephp"></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/front-page.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/front-page.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyseventeen/front-page.php 2018-08-17 01:50:26 UTC (rev 43571)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // The if ( 0 !== twentyseventeen_panel_count() ) ends here.
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> </main><!-- #main -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #primary -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeenfunctionsphp"></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/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/functions.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyseventeen/functions.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * to output valid HTML5.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'html5', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'html5',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment-form',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment-list',
</span><span class="cx" style="display: block; padding: 0 10px"> 'gallery',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,7 +86,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * See: https://codex.wordpress.org/Post_Formats
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post-formats', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post-formats',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'aside',
</span><span class="cx" style="display: block; padding: 0 10px"> 'image',
</span><span class="cx" style="display: block; padding: 0 10px"> 'video',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +100,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add theme support for Custom Logo.
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'custom-logo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'custom-logo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'width' => 250,
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => 250,
</span><span class="cx" style="display: block; padding: 0 10px"> 'flex-width' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -418,11 +421,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_customize_preview() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $customize_preview_data_hue = 'data-hue="' . $hue . '"';
</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"> <style type="text/css" id="custom-theme-colors" <?php echo $customize_preview_data_hue; ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo twentyseventeen_custom_colors_css(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </style>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', 'twentyseventeen_colors_css_wrap' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeenincbackcompatphp"></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/back-compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/inc/back-compat.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyseventeen/inc/back-compat.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyseventeen_customize() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( __( 'Twenty Seventeen requires at least WordPress version 4.7. You are running version %s. Please upgrade and try again.', 'twentyseventeen' ), $GLOBALS['wp_version'] ), '', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sprintf( __( 'Twenty Seventeen requires at least WordPress version 4.7. You are running version %s. Please upgrade and try again.', 'twentyseventeen' ), $GLOBALS['wp_version'] ),
+ '',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'back_link' => 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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyseventeen/inc/custom-header.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,8 +34,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"> add_theme_support(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'custom-header', apply_filters(
- 'twentyseventeen_custom_header_args', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'custom-header',
+ apply_filters(
+ 'twentyseventeen_custom_header_args',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default-image' => get_parent_theme_file_uri( '/assets/images/header.jpg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 2000,
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => 1200,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,16 +81,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // Has the text been hidden?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'blank' === $header_text_color ) :
</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"> .site-title,
</span><span class="cx" style="display: block; padding: 0 10px"> .site-description {
</span><span class="cx" style="display: block; padding: 0 10px"> position: absolute;
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- // 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">+ <?php
+ // 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><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"> .site-title a,
</span><span class="cx" style="display: block; padding: 0 10px"> .colors-dark .site-title a,
</span><span class="cx" style="display: block; padding: 0 10px"> .colors-custom .site-title a,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +113,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </style>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // End of twentyseventeen_header_style.
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeeninccustomizerphp"></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/customizer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/inc/customizer.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyseventeen/inc/customizer.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,13 +18,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->selective_refresh->add_partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blogname', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blogname',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'selector' => '.site-title a',
</span><span class="cx" style="display: block; padding: 0 10px"> 'render_callback' => 'twentyseventeen_customize_partial_blogname',
</span><span class="cx" style="display: 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_customize->selective_refresh->add_partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blogdescription', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blogdescription',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'selector' => '.site-description',
</span><span class="cx" style="display: block; padding: 0 10px"> 'render_callback' => 'twentyseventeen_customize_partial_blogdescription',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +36,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Custom colors.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'colorscheme', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'colorscheme',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => 'light',
</span><span class="cx" style="display: block; padding: 0 10px"> 'transport' => 'postMessage',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'twentyseventeen_sanitize_colorscheme',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +45,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"> $wp_customize->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'colorscheme_hue', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'colorscheme_hue',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => 250,
</span><span class="cx" style="display: block; padding: 0 10px"> 'transport' => 'postMessage',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'absint', // The hue is stored as a positive integer.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +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"> $wp_customize->add_control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'colorscheme', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'colorscheme',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'radio',
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Color Scheme', 'twentyseventeen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'choices' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +70,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_control(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Color_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_customize, 'colorscheme_hue', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_customize,
+ 'colorscheme_hue',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mode' => 'hue',
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'colors',
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 6,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +84,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Theme options.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_section(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'theme_options', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'theme_options',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Theme Options', 'twentyseventeen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 130, // Before Additional CSS.
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,7 +92,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"> $wp_customize->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'page_layout', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'page_layout',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => 'two-column',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'twentyseventeen_sanitize_page_layout',
</span><span class="cx" style="display: block; padding: 0 10px"> 'transport' => 'postMessage',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +101,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"> $wp_customize->add_control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'page_layout', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'page_layout',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Page Layout', 'twentyseventeen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'theme_options',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'radio',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +127,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a setting and control for each of the sections available in the theme.
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 1; $i < ( 1 + $num_sections ); $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'panel_' . $i, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'panel_' . $i,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'absint',
</span><span class="cx" style="display: block; padding: 0 10px"> 'transport' => 'postMessage',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,7 +136,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"> $wp_customize->add_control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'panel_' . $i, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'panel_' . $i,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %d is the front page section number */
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => sprintf( __( 'Front Page Section %d Content', 'twentyseventeen' ), $i ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => ( 1 !== $i ? '' : __( 'Select pages to feature in each area from the dropdowns. Add an image to a section by setting a featured image in the page editor. Empty sections will not be displayed.', 'twentyseventeen' ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,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"> $wp_customize->selective_refresh->add_partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'panel_' . $i, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'panel_' . $i,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'selector' => '#panel' . $i,
</span><span class="cx" style="display: block; padding: 0 10px"> 'render_callback' => 'twentyseventeen_front_page_section',
</span><span class="cx" style="display: block; padding: 0 10px"> 'container_inclusive' => true,
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyseventeen/search.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> else :
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'twentyseventeen' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeentemplatepartsfooterfooterwidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/template-parts/footer/footer-widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/template-parts/footer/footer-widgets.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyseventeen/template-parts/footer/footer-widgets.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,19 +13,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_active_sidebar( 'sidebar-2' ) ||
</span><span class="cx" style="display: block; padding: 0 10px"> is_active_sidebar( 'sidebar-3' ) ) :
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <aside class="widget-area" role="complementary" aria-label="<?php esc_attr_e( 'Footer', 'twentyseventeen' ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_active_sidebar( 'sidebar-2' ) ) {
</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"> <div class="widget-column footer-widget-1">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php dynamic_sidebar( 'sidebar-2' ); ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_active_sidebar( 'sidebar-3' ) ) {
</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"> <div class="widget-column footer-widget-2">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php dynamic_sidebar( 'sidebar-3' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeentemplatepartsheadersitebrandingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> $description = get_bloginfo( 'description', 'display' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $description || is_customize_preview() ) :
</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"> <p class="site-description"><?php echo $description; ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .site-branding-text -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeentemplatepartspagecontentfrontpagepanelsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/template-parts/page/content-front-page-panels.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/template-parts/page/content-front-page-panels.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyseventeen/template-parts/page/content-front-page-panels.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,13 +46,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> get_the_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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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
</span><span class="cx" style="display: block; padding: 0 10px"> // Show recent blog posts if is blog posts page (Note that get_option returns a string, so we're casting the result as an int).
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_the_ID() === (int) get_option( 'page_for_posts' ) ) :
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // Show three most recent posts.
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeentemplatepartspagecontentfrontpagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/template-parts/page/content-front-page.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/template-parts/page/content-front-page.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyseventeen/template-parts/page/content-front-page.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> get_the_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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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"> </div><!-- .wrap -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeentemplatepartspagecontentpagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/template-parts/page/content-page.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/template-parts/page/content-page.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyseventeen/template-parts/page/content-page.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,6 +27,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'after' => '</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- #post-## -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeentemplatepartspostcontentnonephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-none.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-none.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-none.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <div class="page-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_home() && current_user_can( 'publish_posts' ) ) :
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php printf( __( 'Ready to publish your first post? <a href="%1$s">Get started here</a>.', 'twentyseventeen' ), esc_url( admin_url( 'post-new.php' ) ) ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,6 +30,6 @@
</span><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"> endif;
</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"> </div><!-- .page-content -->
</span><span class="cx" style="display: block; padding: 0 10px"> </section><!-- .no-results -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentysixteencommentsphp"></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/comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentysixteen/comments.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentysixteen/comments.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // If comments are closed and there are comments, let's leave a little note, shall we?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
</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"> <p class="no-comments"><?php _e( 'Comments are closed.', 'twentysixteen' ); ?></p>
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,6 +78,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'title_reply_after' => '</h2>',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .comments-area -->
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentysixteen/functions.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,7 +70,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Sixteen 1.2
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'custom-logo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'custom-logo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'height' => 240,
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 240,
</span><span class="cx" style="display: block; padding: 0 10px"> 'flex-height' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +99,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * to output valid HTML5.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'html5', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'html5',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'search-form',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment-form',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment-list',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,7 +115,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * See: https://codex.wordpress.org/Post_Formats
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post-formats', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post-formats',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'aside',
</span><span class="cx" style="display: block; padding: 0 10px"> 'image',
</span><span class="cx" style="display: block; padding: 0 10px"> 'video',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,7 +236,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'family' => urlencode( implode( '|', $fonts ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'subset' => urlencode( $subsets ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'https://fonts.googleapis.com/css'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'https://fonts.googleapis.com/css'
</ins><span class="cx" style="display: block; 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">@@ -297,7 +301,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'twentysixteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20160816', true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'twentysixteen-script', 'screenReaderText', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'twentysixteen-script',
+ 'screenReaderText',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'expand' => __( 'expand child menu', 'twentysixteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'collapse' => __( 'collapse child menu', 'twentysixteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentysixteenheaderphp"></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/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentysixteen/header.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentysixteen/header.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,7 +40,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $description = get_bloginfo( 'description', 'display' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $description || is_customize_preview() ) :
</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"> <p class="site-description"><?php echo $description; ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .site-branding -->
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentysixteen/image.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> // Start the loop.
</span><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><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">
</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">
</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"> 'separator' => '<span class="screen-reader-text">, </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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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"> <footer class="entry-footer">
</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 class="edit-link">',
</span><span class="cx" style="display: block; padding: 0 10px"> '</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </footer><!-- .entry-footer -->
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentysixteenincbackcompatphp"></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/back-compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentysixteen/inc/back-compat.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentysixteen/inc/back-compat.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentysixteen_customize() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( __( 'Twenty Sixteen requires at least WordPress version 4.4. You are running version %s. Please upgrade and try again.', 'twentysixteen' ), $GLOBALS['wp_version'] ), '', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sprintf( __( 'Twenty Sixteen requires at least WordPress version 4.4. You are running version %s. Please upgrade and try again.', 'twentysixteen' ), $GLOBALS['wp_version'] ),
+ '',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'back_link' => 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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentysixteen/inc/customizer.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,8 +31,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"> add_theme_support(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'custom-background', apply_filters(
- 'twentysixteen_custom_background_args', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'custom-background',
+ apply_filters(
+ 'twentysixteen_custom_background_args',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default-color' => $default_background_color,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,8 +57,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"> add_theme_support(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'custom-header', apply_filters(
- 'twentysixteen_custom_header_args', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'custom-header',
+ apply_filters(
+ 'twentysixteen_custom_header_args',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default-text-color' => $default_text_color,
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 1200,
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => 280,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +120,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $wp_customize->selective_refresh ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->selective_refresh->add_partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blogname', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blogname',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'selector' => '.site-title a',
</span><span class="cx" style="display: block; padding: 0 10px"> 'container_inclusive' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'render_callback' => 'twentysixteen_customize_partial_blogname',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,7 +128,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"> $wp_customize->selective_refresh->add_partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blogdescription', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blogdescription',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'selector' => '.site-description',
</span><span class="cx" style="display: block; padding: 0 10px"> 'container_inclusive' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'render_callback' => 'twentysixteen_customize_partial_blogdescription',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +139,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add color scheme setting and control.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'color_scheme', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'color_scheme',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => 'default',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'twentysixteen_sanitize_color_scheme',
</span><span class="cx" style="display: block; padding: 0 10px"> 'transport' => 'postMessage',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,7 +148,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"> $wp_customize->add_control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'color_scheme', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'color_scheme',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Base Color Scheme', 'twentysixteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'colors',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'select',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,7 +160,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add page background color setting and control.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'page_background_color', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'page_background_color',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => $color_scheme[1],
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'sanitize_hex_color',
</span><span class="cx" style="display: block; padding: 0 10px"> 'transport' => 'postMessage',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,7 +170,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_control(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Color_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_customize, 'page_background_color', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_customize,
+ 'page_background_color',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Page Background Color', 'twentysixteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'colors',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,7 +184,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add link color setting and control.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'link_color', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'link_color',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => $color_scheme[2],
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'sanitize_hex_color',
</span><span class="cx" style="display: block; padding: 0 10px"> 'transport' => 'postMessage',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,7 +194,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_control(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Color_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_customize, 'link_color', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_customize,
+ 'link_color',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Link Color', 'twentysixteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'colors',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,7 +205,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add main text color setting and control.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'main_text_color', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'main_text_color',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => $color_scheme[3],
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'sanitize_hex_color',
</span><span class="cx" style="display: block; padding: 0 10px"> 'transport' => 'postMessage',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,7 +215,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_control(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Color_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_customize, 'main_text_color', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_customize,
+ 'main_text_color',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Main Text Color', 'twentysixteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'colors',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +226,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add secondary text color setting and control.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'secondary_text_color', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'secondary_text_color',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => $color_scheme[4],
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'sanitize_hex_color',
</span><span class="cx" style="display: block; padding: 0 10px"> 'transport' => 'postMessage',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,7 +236,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_control(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Color_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_customize, 'secondary_text_color', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_customize,
+ 'secondary_text_color',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Secondary Text Color', 'twentysixteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'colors',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -289,7 +309,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"> return apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'twentysixteen_color_schemes', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'twentysixteen_color_schemes',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Default', 'twentysixteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'colors' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -488,7 +509,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentysixteen_get_color_scheme_css( $colors ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $colors = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $colors, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $colors,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'background_color' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'page_background_color' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_color' => '',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentysixteen/inc/template-tags.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_singular() ) :
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="post-thumbnail">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php the_post_thumbnail(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php the_post_thumbnail(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .post-thumbnail -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,11 +166,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $class = esc_attr( $class );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( has_excerpt() || is_search() ) :
</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"> <div class="<?php echo $class; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_excerpt(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .<?php echo $class; ?> -->
</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
</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"> endif;
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentysixteentemplatepartscontentpagephp"></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/template-parts/content-page.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentysixteen/template-parts/content-page.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentysixteen/template-parts/content-page.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,6 +42,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<footer class="entry-footer"><span class="edit-link">',
</span><span class="cx" style="display: block; padding: 0 10px"> '</span></footer><!-- .entry-footer -->'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?>
</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"> </article><!-- #post-## -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentysixteentemplatepartscontentsinglephp"></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/template-parts/content-single.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentysixteen/template-parts/content-single.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentysixteen/template-parts/content-single.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> if ( '' !== get_the_author_meta( 'description' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> get_template_part( 'template-parts/biography' );
</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"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <footer class="entry-footer">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,6 +50,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<span class="edit-link">',
</span><span class="cx" style="display: block; padding: 0 10px"> '</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </footer><!-- .entry-footer -->
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- #post-## -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentysixteentemplatepartscontentphp"></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/template-parts/content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentysixteen/template-parts/content.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentysixteen/template-parts/content.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'separator' => '<span class="screen-reader-text">, </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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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"> <footer class="entry-footer">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,6 +56,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<span class="edit-link">',
</span><span class="cx" style="display: block; padding: 0 10px"> '</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </footer><!-- .entry-footer -->
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- #post-## -->
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyten/author.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // If a user has filled out their description, show a bio on their entries.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_the_author_meta( 'description' ) ) :
</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"> <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></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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyten/comments.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php if ( post_password_required() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'twentyten' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #comments -->
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Stop the rest of comments.php from being processed,
</span><span class="cx" style="display: block; padding: 0 10px"> * but don't kill the script entirely -- we still have
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,17 +36,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> _n( 'One Response to %2$s', '%1$s Responses to %2$s', get_comments_number(), 'twentyten' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- number_format_i18n( get_comments_number() ), '<em>' . get_the_title() . '</em>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ number_format_i18n( get_comments_number() ),
+ '<em>' . get_the_title() . '</em>'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </h3>
</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"> <div class="navigation">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">←</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">→</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">@@ -61,12 +62,12 @@
</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"> <div class="navigation">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">←</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">→</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">@@ -74,7 +75,7 @@
</span><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><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"> <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></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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyten/functions.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This theme allows users to set a custom background.
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'custom-background', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'custom-background',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> // Let WordPress know what our default background color is.
</span><span class="cx" style="display: block; padding: 0 10px"> 'default-color' => 'f1f1f1',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,7 +227,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Ten 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyten_admin_header_style() {
</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"> <style type="text/css" id="twentyten-admin-header-css">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Shows the same border as on front end */
</span><span class="cx" style="display: block; padding: 0 10px"> #headimg {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,7 +239,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #headimg #desc { }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> </style>
</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
</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">@@ -377,7 +378,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['comment'] = $comment;
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $comment->comment_type ) :
</span><span class="cx" style="display: block; padding: 0 10px"> case '':
</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"> <li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="comment-<?php comment_ID(); ?>">
</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">@@ -384,7 +385,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo get_avatar( $comment, 40 ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf( __( '%s <span class="says">says:</span>', 'twentyten' ), sprintf( '<cite class="fn">%s</cite>', get_comment_author_link() ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .comment-author .vcard -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $comment->comment_approved == '0' ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $comment->comment_approved == '0' ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentyten' ); ?></em>
</span><span class="cx" style="display: block; padding: 0 10px"> <br />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -393,11 +394,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: date, 2: time */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( '%1$s at %2$s', 'twentyten' ), get_comment_date(), get_comment_time() );
</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"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> edit_comment_link( __( '(Edit)', 'twentyten' ), ' ' );
</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"> </div><!-- .comment-meta .commentmetadata -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="comment-body"><?php comment_text(); ?></div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -406,24 +407,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> comment_reply_link(
</span><span class="cx" style="display: block; padding: 0 10px"> array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'depth' => $depth,
</span><span class="cx" style="display: block; padding: 0 10px"> 'max_depth' => $args['max_depth'],
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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"> </div><!-- .reply -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #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">- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'pingback':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'trackback':
</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"> <li class="post pingback">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Pingback:', 'twentyten' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( '(Edit)', 'twentyten' ), ' ' ); ?></p>
</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
</ins><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></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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyten/header.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> echo esc_html( ' | ' . sprintf( __( 'Page %s', 'twentyten' ), max( $paged, $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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </title>
</span><span class="cx" style="display: block; padding: 0 10px"> <link rel="profile" href="http://gmpg.org/xfn/11" />
</span><span class="cx" style="display: block; padding: 0 10px"> <link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
</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"> $header_image_width = HEADER_IMAGE_WIDTH;
</span><span class="cx" style="display: block; padding: 0 10px"> $header_image_height = HEADER_IMAGE_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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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 endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #branding -->
</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_location' => 'primary',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #access -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #masthead -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyten/loop-attachment.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> if ( have_posts() ) {
</span><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><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">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! empty( $post->post_parent ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="page-title"><a href="<?php echo esc_url( get_permalink( $post->post_parent ) ); ?>" title="<?php echo esc_attr( sprintf( __( 'Return to %s', 'twentyten' ), strip_tags( get_the_title( $post->post_parent ) ) ) ); ?>" rel="gallery">
</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
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s - title of parent post */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( '<span class="meta-nav">←</span> %s', 'twentyten' ), get_the_title( $post->post_parent ) );
</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"> </a></p>
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,7 +45,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> get_the_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">- ?>
</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="meta-sep">|</span>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,40 +77,40 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-attachment">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- if ( wp_attachment_is_image() ) :
- $attachments = array_values(
- get_children(
- array(
- 'post_parent' => $post->post_parent,
- 'post_status' => 'inherit',
- 'post_type' => 'attachment',
- 'post_mime_type' => 'image',
- 'order' => 'ASC',
- 'orderby' => 'menu_order ID',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( wp_attachment_is_image() ) :
+ $attachments = array_values(
+ get_children(
+ array(
+ 'post_parent' => $post->post_parent,
+ 'post_status' => 'inherit',
+ 'post_type' => 'attachment',
+ 'post_mime_type' => 'image',
+ 'order' => 'ASC',
+ 'orderby' => 'menu_order 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">- )
- );
- foreach ( $attachments as $k => $attachment ) {
- if ( $attachment->ID == $post->ID ) {
- break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ );
+ foreach ( $attachments as $k => $attachment ) {
+ if ( $attachment->ID == $post->ID ) {
+ break;
+ }
</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">
</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
- if ( count( $attachments ) > 1 ) {
- $k++;
- if ( isset( $attachments[ $k ] ) ) {
- // get the URL of the next image attachment
- $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
- } else { // or get the URL of the first image attachment
- $next_attachment_url = get_attachment_link( $attachments[0]->ID );
</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
+ if ( count( $attachments ) > 1 ) {
+ $k++;
+ if ( isset( $attachments[ $k ] ) ) {
+ // get the URL of the next image attachment
+ $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
+ } else { // or get the URL of the first image attachment
+ $next_attachment_url = get_attachment_link( $attachments[0]->ID );
+ }
+ } else {
+ // or, if there's only 1 image attachment, get the URL of the image
+ $next_attachment_url = wp_get_attachment_url();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
- // or, if there's only 1 image attachment, get the URL of the image
- $next_attachment_url = wp_get_attachment_url();
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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><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">@@ -130,7 +130,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_height = apply_filters( 'twentyten_attachment_height', 900 );
</span><span class="cx" style="display: block; padding: 0 10px"> echo wp_get_attachment_image( $post->ID, array( $attachment_width, $attachment_height ) ); // filterable image width with, essentially, no limit for image height.
</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"> </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">@@ -137,7 +137,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="nav-previous"><?php previous_image_link( false ); ?></div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="nav-next"><?php next_image_link( false ); ?></div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #nav-below -->
</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"> <a href="<?php echo esc_url( wp_get_attachment_url() ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php echo esc_html( basename( get_permalink() ) ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-attachment -->
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,18 +145,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $post->post_excerpt ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> the_excerpt();}
</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"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyten' ) ); ?>
- <?php
- wp_link_pages(
- array(
- 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ),
- 'after' => '</div>',
- )
- );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyten' ) ); ?>
+ <?php
+ wp_link_pages(
+ array(
+ 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ),
+ 'after' => '</div>',
+ )
+ );
+ ?>
</ins><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><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"> </div><!-- .entry-utility -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php comments_template(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php comments_template(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile;
</span><span class="cx" style="display: block; padding: 0 10px"> }; // end of the loop. ?>
</span></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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyten/loop-page.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> if ( have_posts() ) {
</span><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><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">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_front_page() ) { ?>
</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"> 'after' => '</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #post-## -->
</span></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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyten/loop-single.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> if ( have_posts() ) {
</span><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><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">
</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 previous_post_link( '%link', '<span class="meta-nav">' . _x( '←', 'Previous post link', 'twentyten' ) . '</span> %title' ); ?></div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,10 +42,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'after' => '</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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></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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentyten/loop.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,9 +58,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><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><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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php /* How to display posts of the Gallery format. The gallery category is the old way. */ ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php /* How to display posts of the Gallery format. The gallery category is the old way. */ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ( function_exists( 'get_post_format' ) && 'gallery' == get_post_format( $post->ID ) ) || in_category( _x( 'gallery', 'gallery category slug', 'twentyten' ) ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</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"> </div><!-- .entry-meta -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( post_password_required() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( post_password_required() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php the_content(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</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"> if ( $images ) :
</span><span class="cx" style="display: block; padding: 0 10px"> $total_images = count( $images );
</span><span class="cx" style="display: block; padding: 0 10px"> $image = reset( $images );
</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"> <div class="gallery-thumb">
</span><span class="cx" style="display: block; padding: 0 10px"> <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo wp_get_attachment_image( $image, 'thumbnail' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .gallery-thumb -->
</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"> 'href="' . esc_url( get_permalink() ) . '" title="' . esc_attr( sprintf( __( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ) ) . '" rel="bookmark"',
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $total_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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </em></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // end twentyten_get_gallery_images() check ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_excerpt(); ?>
</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"> </div><!-- .entry-utility -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php /* How to display posts of the Aside format. The asides category is the old way. */ ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php /* How to display posts of the Aside format. The asides category is the old way. */ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( ( function_exists( 'get_post_format' ) && 'aside' == get_post_format( $post->ID ) ) || in_category( _x( 'asides', 'asides category slug', 'twentyten' ) ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</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"> </div><!-- .entry-utility -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php /* How to display all other posts. */ ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php /* How to display all other posts. */ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</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"> 'after' => '</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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $tags_list = get_the_tag_list( '', ', ' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $tags_list ) :
</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"> <span class="tag-links">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentyten' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </span>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentythirteen/archive.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> else :
</span><span class="cx" style="display: block; padding: 0 10px"> _e( 'Archives', 'twentythirteen' );
</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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><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"> <?php
</span><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><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"> <?php get_template_part( 'content', get_post_format() ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile; ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentythirteen/author.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><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><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"> <?php get_template_part( 'content', get_post_format() ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile; ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentythirteen/category.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><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><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"> <?php get_template_part( 'content', get_post_format() ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile; ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentythirteen/comments.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> _nx( 'One thought on “%2$s”', '%1$s thoughts on “%2$s”', get_comments_number(), 'comments title', 'twentythirteen' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ number_format_i18n( get_comments_number() ),
+ '<span>' . get_the_title() . '</span>'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </h2>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,7 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // Are there comments to navigate through?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) :
</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"> <nav class="navigation comment-navigation" role="navigation">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="screen-reader-text section-heading"><?php _e( 'Comment navigation', 'twentythirteen' ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="nav-previous"><?php previous_comments_link( __( '← Older Comments', 'twentythirteen' ) ); ?></div>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentythirteencontentasidephp"></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-aside.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/content-aside.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentythirteen/content-aside.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'link_after' => '</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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"> <footer class="entry-meta">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentythirteencontentaudiophp"></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-audio.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/content-audio.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentythirteen/content-audio.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'link_after' => '</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .audio-content -->
</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></pre></div>
<a id="trunksrcwpcontentthemestwentythirteencontentchatphp"></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-chat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/content-chat.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentythirteen/content-chat.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'link_after' => '</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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"> <footer class="entry-meta">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentythirteencontentgalleryphp"></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-gallery.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/content-gallery.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentythirteen/content-gallery.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'link_after' => '</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo get_post_gallery(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // is_single() ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentythirteencontentimagephp"></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-image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/content-image.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentythirteen/content-image.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'link_after' => '</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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"> <footer class="entry-meta">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentythirteencontentlinkphp"></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-link.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/content-link.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentythirteen/content-link.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'link_after' => '</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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 if ( is_single() ) : ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentythirteencontentquotephp"></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-quote.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/content-quote.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentythirteen/content-quote.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'link_after' => '</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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"> <footer class="entry-meta">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentythirteencontentstatusphp"></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-status.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/content-status.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentythirteen/content-status.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'link_after' => '</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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"> <footer class="entry-meta">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentythirteencontentvideophp"></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-video.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/content-video.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentythirteen/content-video.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'link_after' => '</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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"> <footer class="entry-meta">
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentythirteen/functions.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,7 +84,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * and comments to output valid HTML5.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'html5', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'html5',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'search-form',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment-form',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment-list',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +99,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * See https://codex.wordpress.org/Post_Formats
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post-formats', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post-formats',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'aside',
</span><span class="cx" style="display: block; padding: 0 10px"> 'audio',
</span><span class="cx" style="display: block; padding: 0 10px"> 'chat',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,7 +336,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .nav-links -->
</span><span class="cx" style="display: block; padding: 0 10px"> </nav><!-- .navigation -->
</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
</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">@@ -364,7 +366,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .nav-links -->
</span><span class="cx" style="display: block; padding: 0 10px"> </nav><!-- .navigation -->
</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
</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">@@ -611,7 +613,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $wp_customize->selective_refresh ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->selective_refresh->add_partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blogname', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blogname',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'selector' => '.site-title',
</span><span class="cx" style="display: block; padding: 0 10px"> 'container_inclusive' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'render_callback' => 'twentythirteen_customize_partial_blogname',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -618,7 +621,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"> $wp_customize->selective_refresh->add_partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blogdescription', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blogdescription',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'selector' => '.site-description',
</span><span class="cx" style="display: block; padding: 0 10px"> 'container_inclusive' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'render_callback' => 'twentythirteen_customize_partial_blogdescription',
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentythirteenheaderphp"></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/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/header.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentythirteen/header.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'menu_id' => 'primary-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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php get_search_form(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </nav><!-- #site-navigation -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #navbar -->
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentythirteen/image.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> // Start the Loop.
</span><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><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">
</span><span class="cx" style="display: block; padding: 0 10px"> <article id="post-<?php the_ID(); ?>" <?php post_class( 'image-attachment' ); ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</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"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- #post -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php comments_template(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php comments_template(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile; // End the loop. ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentythirteenincbackcompatphp"></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/inc/back-compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/inc/back-compat.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentythirteen/inc/back-compat.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,7 +45,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentythirteen_customize() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( __( 'Twenty Thirteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentythirteen' ), $GLOBALS['wp_version'] ), '', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sprintf( __( 'Twenty Thirteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentythirteen' ), $GLOBALS['wp_version'] ),
+ '',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'back_link' => 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="trunksrcwpcontentthemestwentythirteeninccustomheaderphp"></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/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/twentythirteen/inc/custom-header.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentythirteen/inc/custom-header.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <style type="text/css" id="twentythirteen-header-css">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $header_image ) ) :
</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"> .site-header {
</span><span class="cx" style="display: block; padding: 0 10px"> background: url(<?php header_image(); ?>) no-repeat scroll top;
</span><span class="cx" style="display: block; padding: 0 10px"> background-size: 1600px auto;
</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"> background-size: 360px auto;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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"> // Has the text been hidden?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! display_header_text() ) :
</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"> .site-title,
</span><span class="cx" style="display: block; padding: 0 10px"> .site-description {
</span><span class="cx" style="display: block; padding: 0 10px"> position: absolute;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,18 +126,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> clip: rect(1px 1px 1px 1px); /* IE7 */
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- if ( empty( $header_image ) ) :
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( empty( $header_image ) ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> .site-header .home-link {
</span><span class="cx" style="display: block; padding: 0 10px"> min-height: 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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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"> // If the user has set a custom color for the text, use that.
</span><span class="cx" style="display: block; padding: 0 10px"> elseif ( $text_color != get_theme_support( 'custom-header', 'default-text-color' ) ) :
</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"> .site-title,
</span><span class="cx" style="display: block; padding: 0 10px"> .site-description {
</span><span class="cx" style="display: block; padding: 0 10px"> color: #<?php echo esc_attr( $text_color ); ?>;
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentythirteen_admin_header_style() {
</span><span class="cx" style="display: block; padding: 0 10px"> $header_image = get_header_image();
</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"> <style type="text/css" id="twentythirteen-admin-header-css">
</span><span class="cx" style="display: block; padding: 0 10px"> .appearance_page_custom-header #headimg {
</span><span class="cx" style="display: block; padding: 0 10px"> border: none;
</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"> width: auto;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> </style>
</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
</ins><span class="cx" style="display: block; 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">@@ -232,5 +232,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h2 id="desc" class="displaying-header-text" style="<?php echo esc_attr( $style ); ?>"><?php bloginfo( 'description' ); ?></h2>
</span><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">-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentythirteen/index.php 2018-08-17 01:50:26 UTC (rev 43571)
</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
</span><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><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"> <?php get_template_part( 'content', get_post_format() ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile; ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentythirteen/page.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><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><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">
</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"> <header class="entry-header">
</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"> 'link_after' => '</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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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"> <footer class="entry-meta">
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentythirteen/search.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><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><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"> <?php get_template_part( 'content', get_post_format() ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile; ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentythirteen/single.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><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><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">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php get_template_part( 'content', get_post_format() ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php twentythirteen_post_nav(); ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentythirteen/tag.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><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><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"> <?php get_template_part( 'content', get_post_format() ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile; ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentythirteen/taxonomy-post_format.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><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><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"> <?php get_template_part( 'content', get_post_format() ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile; ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentytwelve/archive.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> else :
</span><span class="cx" style="display: block; padding: 0 10px"> _e( 'Archives', 'twentytwelve' );
</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><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></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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentytwelve/author.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // If a user has filled out their description, show a bio on their entries.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_the_author_meta( 'description' ) ) :
</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"> <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">@@ -71,7 +71,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><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><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"> <?php get_template_part( 'content', get_post_format() ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentytwelve/comments.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> _n( 'One thought on “%2$s”', '%1$s thoughts on “%2$s”', get_comments_number(), 'twentytwelve' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ number_format_i18n( get_comments_number() ),
+ '<span>' . get_the_title() . '</span>'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </h2>
</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"> 'style' => 'ol',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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"> </ol><!-- .commentlist -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,7 +61,7 @@
</span><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><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"> <p class="nocomments"><?php _e( 'Comments are closed.', 'twentytwelve' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelvecontentpagephp"></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-page.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/content-page.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentytwelve/content-page.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <header class="entry-header">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! is_page_template( 'page-templates/front-page.php' ) ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php the_post_thumbnail(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php the_post_thumbnail(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="entry-title"><?php the_title(); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> </header>
</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"> 'after' => '</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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</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 edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentytwelve/content.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'after' => '</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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelvefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwelve/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/functions.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentytwelve/functions.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +69,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * and here we also set up the default background color.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'custom-background', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'custom-background',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default-color' => 'e6e6e6',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -330,7 +331,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">←</span> Older posts', 'twentytwelve' ) ); ?></div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">→</span>', 'twentytwelve' ) ); ?></div>
</span><span class="cx" style="display: block; padding: 0 10px"> </nav><!-- .navigation -->
</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
</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"> endif;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,15 +353,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'pingback':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'trackback':
</span><span class="cx" style="display: block; padding: 0 10px"> // Display trackbacks differently than normal comments.
</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"> <li <?php comment_class(); ?> id="comment-<?php comment_ID(); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Pingback:', 'twentytwelve' ); ?> <?php comment_author_link(); ?> <?php edit_comment_link( __( '(Edit)', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?></p>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><span class="cx" style="display: block; padding: 0 10px"> // Proceed with normal comments.
</span><span class="cx" style="display: block; padding: 0 10px"> global $post;
</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"> <li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <article id="comment-<?php comment_ID(); ?>" class="comment">
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="comment-meta comment-author vcard">
</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"> /* translators: 1: date, 2: time */
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( __( '%1$s at %2$s', 'twentytwelve' ), get_comment_date(), get_comment_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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </header><!-- .comment-meta -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( '0' == $comment->comment_approved ) : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -395,7 +396,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> comment_reply_link(
</span><span class="cx" style="display: block; padding: 0 10px"> array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'reply_text' => __( 'Reply', 'twentytwelve' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'after' => ' <span>↓</span>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'depth' => $depth,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -403,10 +405,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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .reply -->
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- #comment-## -->
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> endswitch; // end comment_type check
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -551,7 +553,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $wp_customize->selective_refresh ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->selective_refresh->add_partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blogname', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blogname',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'selector' => '.site-title > a',
</span><span class="cx" style="display: block; padding: 0 10px"> 'container_inclusive' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'render_callback' => 'twentytwelve_customize_partial_blogname',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -558,7 +561,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"> $wp_customize->selective_refresh->add_partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blogdescription', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blogdescription',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'selector' => '.site-description',
</span><span class="cx" style="display: block; padding: 0 10px"> 'container_inclusive' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'render_callback' => 'twentytwelve_customize_partial_blogdescription',
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelveheaderphp"></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/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/header.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentytwelve/header.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'menu_class' => '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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </nav><!-- #site-navigation -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( get_header_image() ) : ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentytwelve/image.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><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><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">
</span><span class="cx" style="display: block; padding: 0 10px"> <article id="post-<?php the_ID(); ?>" <?php post_class( 'image-attachment' ); ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,39 +51,39 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-attachment">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="attachment">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/*
- * Grab the IDs of all the image attachments in a gallery so we can get the URL of the next adjacent image in a gallery,
- * or the first image (if we're looking at the last image in a gallery), or, in a gallery of one, just the link to that image file
- */
-$attachments = array_values(
- get_children(
- array(
- 'post_parent' => $post->post_parent,
- 'post_status' => 'inherit',
- 'post_type' => 'attachment',
- 'post_mime_type' => 'image',
- 'order' => 'ASC',
- 'orderby' => 'menu_order ID',
- )
- )
-);
-foreach ( $attachments as $k => $attachment ) :
- if ( $attachment->ID == $post->ID ) {
- break;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /*
+ * Grab the IDs of all the image attachments in a gallery so we can get the URL of the next adjacent image in a gallery,
+ * or the first image (if we're looking at the last image in a gallery), or, in a gallery of one, just the link to that image file
+ */
+ $attachments = array_values(
+ get_children(
+ array(
+ 'post_parent' => $post->post_parent,
+ 'post_status' => 'inherit',
+ 'post_type' => 'attachment',
+ 'post_mime_type' => 'image',
+ 'order' => 'ASC',
+ 'orderby' => 'menu_order ID',
+ )
+ )
+ );
+ foreach ( $attachments as $k => $attachment ) :
+ if ( $attachment->ID == $post->ID ) {
+ break;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> endforeach;
</span><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
-if ( count( $attachments ) > 1 ) :
- $k++;
- if ( isset( $attachments[ $k ] ) ) :
- // get the URL of the next image attachment
- $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
- else :
- // or get the URL of the first image attachment
- $next_attachment_url = get_attachment_link( $attachments[0]->ID );
- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If there is more than 1 attachment in a gallery
+ if ( count( $attachments ) > 1 ) :
+ $k++;
+ if ( isset( $attachments[ $k ] ) ) :
+ // get the URL of the next image attachment
+ $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
+ else :
+ // or get the URL of the first image attachment
+ $next_attachment_url = get_attachment_link( $attachments[0]->ID );
+ endif;
</ins><span class="cx" style="display: block; padding: 0 10px"> else :
</span><span class="cx" style="display: block; padding: 0 10px"> // or, if there's only 1 image, get the URL of the image
</span><span class="cx" style="display: block; padding: 0 10px"> $next_attachment_url = wp_get_attachment_url();
</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"> $attachment_size = apply_filters( 'twentytwelve_attachment_size', array( 960, 960 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> echo wp_get_attachment_image( $post->ID, $attachment_size );
</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"> </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">@@ -124,7 +124,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'after' => '</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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-description -->
</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></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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentytwelve/inc/custom-header.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // Has the text been hidden?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! display_header_text() ) :
</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"> .site-title,
</span><span class="cx" style="display: block; padding: 0 10px"> .site-description {
</span><span class="cx" style="display: block; padding: 0 10px"> position: absolute;
</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"> clip: rect(1px 1px 1px 1px); /* IE7 */
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- // 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">+ <?php
+ // 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><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"> .site-header h1 a,
</span><span class="cx" style="display: block; padding: 0 10px"> .site-header h2 {
</span><span class="cx" style="display: block; padding: 0 10px"> color: #<?php echo $text_color; ?>;
</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"> * @since Twenty Twelve 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentytwelve_admin_header_style() {
</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"> <style type="text/css" id="twentytwelve-admin-header-css">
</span><span class="cx" style="display: block; padding: 0 10px"> .appearance_page_custom-header #headimg {
</span><span class="cx" style="display: block; padding: 0 10px"> border: none;
</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"> max-width: <?php echo get_theme_support( 'custom-header', 'max-width' ); ?>px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> </style>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,9 +160,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</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"> if ( ! empty( $header_image ) ) :
</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"> <img src="<?php echo esc_url( $header_image ); ?>" class="header-image" width="<?php echo esc_attr( get_custom_header()->width ); ?>" height="<?php echo esc_attr( get_custom_header()->height ); ?>" alt="" />
</span><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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentytwelve/index.php 2018-08-17 01:50:26 UTC (rev 43571)
</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
</span><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><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"> <?php get_template_part( 'content', get_post_format() ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile; ?>
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'edit_posts' ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> // Show a different message to a logged-in user who can add posts.
</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"> <header class="entry-header">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="entry-title"><?php _e( 'No posts to display', 'twentytwelve' ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> </header>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,10 +46,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php printf( __( 'Ready to publish your first post? <a href="%s">Get started here</a>.', 'twentytwelve' ), admin_url( 'post-new.php' ) ); ?></p>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> else :
</span><span class="cx" style="display: block; padding: 0 10px"> // Show the default message to everyone else.
</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"> <header class="entry-header">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="entry-title"><?php _e( 'Nothing Found', 'twentytwelve' ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> </header>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentytwelve/page-templates/front-page.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><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><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"> <?php if ( has_post_thumbnail() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-page-image">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_post_thumbnail(); ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentytwelve/page-templates/full-width.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><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><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"> <?php get_template_part( 'content', 'page' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php comments_template( '', true ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile; // end of the loop. ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentytwelve/page.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><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><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"> <?php get_template_part( 'content', 'page' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php comments_template( '', true ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile; // end of the loop. ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentytwelve/search.php 2018-08-17 01:50:26 UTC (rev 43571)
</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
</span><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><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"> <?php get_template_part( 'content', get_post_format() ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile; ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-content/themes/twentytwelve/single.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><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><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">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php get_template_part( 'content', get_post_format() ); ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/admin-bar.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1077,7 +1077,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_admin_bar_header() {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <style type="text/css" media="print">#wpadminbar { display:none; }</style>
</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
</ins><span class="cx" style="display: block; 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">@@ -1087,7 +1087,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _admin_bar_bump_cb() {
</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"> <style type="text/css" media="screen">
</span><span class="cx" style="display: block; padding: 0 10px"> html { margin-top: 32px !important; }
</span><span class="cx" style="display: block; padding: 0 10px"> * html body { margin-top: 32px !important; }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1096,7 +1096,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * html body { margin-top: 46px !important; }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> </style>
</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
</ins><span class="cx" style="display: block; 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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/author-template.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,7 +63,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( true !== $deprecated_echo ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __FUNCTION__, '1.5.0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __FUNCTION__,
+ '1.5.0',
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: get_the_author() */
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Use %s instead if you do not want the value echoed.' ),
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/bookmark-template.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,7 +237,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $r['categorize'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $cats = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'link_category', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'link_category',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name__like' => $r['category_name'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'include' => $r['category'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'exclude' => $r['exclude_category'],
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/canonical.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -416,8 +416,10 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '|', array_map(
- 'preg_quote', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '|',
+ array_map(
+ 'preg_quote',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> ' ',
</span><span class="cx" style="display: block; padding: 0 10px"> '%20', // space
</span><span class="cx" style="display: block; padding: 0 10px"> '!',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/category-template.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,7 +353,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Back compat.
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __FUNCTION__, '3.0.0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __FUNCTION__,
+ '3.0.0',
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: "type => link", 2: "taxonomy => link_category" */
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( '%1$s is deprecated. Use %2$s instead.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -698,8 +699,10 @@
</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"> $tags = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args['taxonomy'], array_merge(
- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args['taxonomy'],
+ array_merge(
+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'count',
</span><span class="cx" style="display: block; padding: 0 10px"> 'order' => 'DESC',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/category.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Back compat
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __FUNCTION__, '3.0.0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __FUNCTION__,
+ '3.0.0',
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: "type => link", 2: "taxonomy => link_category" */
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( '%1$s is deprecated. Use %2$s instead.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,7 +135,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $full_path .= ( $pathdir != '' ? '/' : '' ) . sanitize_title( $pathdir );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $categories = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'category', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'category',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'get' => 'all',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => $leaf_path,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunksrcwpincludesclassoembedphp"></a>
<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-oembed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-oembed.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/class-oembed.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,7 +451,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * used by at least Vimeo).
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $linktypes = apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'oembed_linktypes', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'oembed_linktypes',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'application/json+oembed' => 'json',
</span><span class="cx" style="display: block; padding: 0 10px"> 'text/xml+oembed' => 'xml',
</span><span class="cx" style="display: block; padding: 0 10px"> 'application/xml+oembed' => 'xml',
</span></span></pre></div>
<a id="trunksrcwpincludesclasswalkercategoryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-walker-category.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-walker-category.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/class-walker-category.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,7 +168,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $args['current_category'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // 'current_category' can be an array, so we use `get_terms()`.
</span><span class="cx" style="display: block; padding: 0 10px"> $_current_terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $category->taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $category->taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'include' => $args['current_category'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunksrcwpincludesclasswalkercommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-walker-comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-walker-comment.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/class-walker-comment.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -236,12 +236,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function ping( $comment, $depth, $args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = ( 'div' == $args['style'] ) ? 'div' : 'li';
</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"> <<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( '', $comment ); ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="comment-body">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Pingback:' ); ?> <?php comment_author_link( $comment ); ?> <?php edit_comment_link( __( 'Edit' ), '<span class="edit-link">', '</span>' ); ?>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -263,7 +263,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = 'li';
</span><span class="cx" style="display: block; padding: 0 10px"> $add_below = 'div-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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <<?php echo $tag; ?> <?php comment_class( $this->has_children ? 'parent' : '', $comment ); ?> id="comment-<?php comment_ID(); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( 'div' != $args['style'] ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="div-comment-<?php comment_ID(); ?>" class="comment-body">
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 != $args['avatar_size'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo get_avatar( $comment, $args['avatar_size'] );}
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: comment author link */
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -290,17 +290,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: comment date, 2: comment time */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( '%1$s at %2$s' ), get_comment_date( '', $comment ), get_comment_time() );
</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"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> edit_comment_link( __( '(Edit)' ), ' ', '' );
</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"> </div>
</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"> comment_text(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment, array_merge(
- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment,
+ array_merge(
+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'add_below' => $add_below,
</span><span class="cx" style="display: block; padding: 0 10px"> 'depth' => $depth,
</span><span class="cx" style="display: block; padding: 0 10px"> 'max_depth' => $args['max_depth'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,12 +309,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">-?>
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> comment_reply_link(
</span><span class="cx" style="display: block; padding: 0 10px"> array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'add_below' => $add_below,
</span><span class="cx" style="display: block; padding: 0 10px"> 'depth' => $depth,
</span><span class="cx" style="display: block; padding: 0 10px"> 'max_depth' => $args['max_depth'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,7 +329,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( 'div' != $args['style'] ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -342,7 +345,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function html5_comment( $comment, $depth, $args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = ( 'div' === $args['style'] ) ? 'div' : 'li';
</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"> <<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( $this->has_children ? 'parent' : '', $comment ); ?>>
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -350,7 +353,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 != $args['avatar_size'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo get_avatar( $comment, $args['avatar_size'] );}
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: comment author link */
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -384,7 +387,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> comment_reply_link(
</span><span class="cx" style="display: block; padding: 0 10px"> array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'add_below' => 'div-comment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'depth' => $depth,
</span><span class="cx" style="display: block; padding: 0 10px"> 'max_depth' => $args['max_depth'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -395,6 +399,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- .comment-body -->
</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
</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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1478,7 +1478,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"> $this->set_post_value(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $nav_menu_setting_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nav_menu_setting_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => isset( $nav_menu['name'] ) ? $nav_menu['name'] : $nav_menu_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">@@ -2276,7 +2277,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function validate_setting_values( $setting_values, $options = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $options = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $options, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $options,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'validate_capability' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'validate_existence' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2713,7 +2715,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_values
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $setting_validities = $this->validate_setting_values(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $validated_values, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $validated_values,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'validate_capability' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'validate_existence' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4014,7 +4017,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->branching() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $l10n = array(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: User who is customizing the changeset in customizer. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'locked' => __( '%s is already customizing this changeset. Please wait until they are done to try customizing. Your latest changes have been autosaved.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'locked' => __( '%s is already customizing this changeset. Please wait until they are done to try customizing. Your latest changes have been autosaved.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: User who is customizing the changeset in customizer. */
</span><span class="cx" style="display: block; padding: 0 10px"> 'locked_allow_override' => __( '%s is already customizing this changeset. Do you want to take over?' ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4021,7 +4024,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $l10n = array(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: User who is customizing the changeset in customizer. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'locked' => __( '%s is already customizing this site. Please wait until they are done to try customizing. Your latest changes have been autosaved.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'locked' => __( '%s is already customizing this site. Please wait until they are done to try customizing. Your latest changes have been autosaved.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: User who is customizing the changeset in customizer. */
</span><span class="cx" style="display: block; padding: 0 10px"> 'locked_allow_override' => __( '%s is already customizing this site. Do you want to take over?' ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4029,7 +4032,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->registered_control_types as $control_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $control = new $control_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this, 'temp', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this,
+ 'temp',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'settings' => 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">@@ -4306,10 +4311,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $controls = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->controls = wp_list_sort(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->controls, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->controls,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 'ASC',
</span><span class="cx" style="display: block; padding: 0 10px"> 'instance_number' => 'ASC',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'ASC', true
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'ASC',
+ 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"> foreach ( $this->controls as $id => $control ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4324,10 +4332,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prepare sections.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sections = wp_list_sort(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sections, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sections,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 'ASC',
</span><span class="cx" style="display: block; padding: 0 10px"> 'instance_number' => 'ASC',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'ASC', true
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'ASC',
+ true
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $sections = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4337,7 +4348,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"> $section->controls = wp_list_sort(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $section->controls, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $section->controls,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 'ASC',
</span><span class="cx" style="display: block; padding: 0 10px"> 'instance_number' => 'ASC',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4357,10 +4369,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prepare panels.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->panels = wp_list_sort(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->panels, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->panels,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 'ASC',
</span><span class="cx" style="display: block; padding: 0 10px"> 'instance_number' => 'ASC',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'ASC', true
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'ASC',
+ true
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $panels = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4370,10 +4385,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"> $panel->sections = wp_list_sort(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $panel->sections, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $panel->sections,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 'ASC',
</span><span class="cx" style="display: block; padding: 0 10px"> 'instance_number' => 'ASC',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'ASC', true
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'ASC',
+ true
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $panels[ $panel->id ] = $panel;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4382,10 +4400,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Sort panels and top-level sections together.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->containers = array_merge( $this->panels, $this->sections );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->containers = wp_list_sort(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->containers, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->containers,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 'ASC',
</span><span class="cx" style="display: block; padding: 0 10px"> 'instance_number' => 'ASC',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'ASC', true
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'ASC',
+ 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">@@ -4402,7 +4423,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() && ( current_user_can( 'install_themes' ) || current_user_can( 'update_themes' ) || current_user_can( 'delete_themes' ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'updates' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'updates', '_wpUpdatesItemCounts', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'updates',
+ '_wpUpdatesItemCounts',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'totals' => wp_get_update_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">@@ -4642,7 +4665,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'interim-login' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'customize-login' => 1,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), wp_login_url()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ wp_login_url()
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Ensure dirty flags are set for modified settings.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4840,7 +4864,7 @@
</span><span class="cx" style="display: 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 "})( _wpCustomizeSettings.controls );\n";
</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"> </script>
</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">@@ -4891,7 +4915,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_panel(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Themes_Panel(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this, 'themes', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this,
+ 'themes',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => $this->theme()->display( 'Name' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => (
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Looking for a theme? You can search or browse the WordPress.org theme directory, install and preview themes, then activate them right here.' ) . '</p>' .
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4905,7 +4931,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_section(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Themes_Section(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this, 'installed_themes', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this,
+ 'installed_themes',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Installed themes' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'installed',
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'switch_themes',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4918,7 +4946,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_section(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Themes_Section(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this, 'wporg_themes', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this,
+ 'wporg_themes',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'WordPress.org themes' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'wporg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'filter_type' => 'remote',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4933,7 +4963,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Themes Setting (unused - the theme is considerably more fundamental to the Customizer experience).
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_setting(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Filter_Setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this, 'active_theme', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this,
+ 'active_theme',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'switch_themes',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4942,7 +4974,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* Site Identity */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_section(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'title_tagline', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'title_tagline',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Site Identity' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 20,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4949,7 +4982,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"> $this->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blogname', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blogname',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => get_option( 'blogname' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'manage_options',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4957,7 +4991,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"> $this->add_control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blogname', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blogname',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Site Title' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'title_tagline',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4964,7 +4999,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"> $this->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blogdescription', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blogdescription',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => get_option( 'blogdescription' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'manage_options',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4972,7 +5008,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"> $this->add_control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blogdescription', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blogdescription',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Tagline' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'title_tagline',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4981,7 +5018,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a setting to hide header text if the theme doesn't support custom headers.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_theme_supports( 'custom-header', 'header-text' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'header_text', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'header_text',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'theme_supports' => array( 'custom-logo', 'header-text' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'absint',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4989,7 +5027,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"> $this->add_control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'header_text', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'header_text',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Display Site Title and Tagline' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'title_tagline',
</span><span class="cx" style="display: block; padding: 0 10px"> 'settings' => 'header_text',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4999,7 +5038,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"> $this->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'site_icon', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'site_icon',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'manage_options',
</span><span class="cx" style="display: block; padding: 0 10px"> 'transport' => 'postMessage', // Previewed with JS in the Customizer controls window.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5008,7 +5048,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_control(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Site_Icon_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this, 'site_icon', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this,
+ 'site_icon',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Site Icon' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Site Icons are what you see in browser tabs, bookmark bars, and within the WordPress mobile apps. Upload one here!' ) . '</p>' .
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5025,7 +5067,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"> $this->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'custom_logo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'custom_logo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'theme_supports' => array( 'custom-logo' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'transport' => 'postMessage',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5034,7 +5077,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $custom_logo_args = get_theme_support( 'custom-logo' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_control(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Cropped_Image_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this, 'custom_logo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this,
+ 'custom_logo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Logo' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'title_tagline',
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 8,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5056,7 +5101,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"> $this->selective_refresh->add_partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'custom_logo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'custom_logo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array( 'custom_logo' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'selector' => '.custom-logo-link',
</span><span class="cx" style="display: block; padding: 0 10px"> 'render_callback' => array( $this, '_render_custom_logo_partial' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5067,7 +5113,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* Colors */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_section(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'colors', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'colors',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Colors' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 40,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5074,7 +5121,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"> $this->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'header_textcolor', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'header_textcolor',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'theme_supports' => array( 'custom-header', 'header-text' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => get_theme_support( 'custom-header', 'default-text-color' ),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5086,7 +5134,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Input type: checkbox
</span><span class="cx" style="display: block; padding: 0 10px"> // With custom value
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'display_header_text', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'display_header_text',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'settings' => 'header_textcolor',
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Display Site Title and Tagline' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'title_tagline',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5097,7 +5146,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_control(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Color_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this, 'header_textcolor', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this,
+ 'header_textcolor',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Header Text Color' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'colors',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5107,7 +5158,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Input type: Color
</span><span class="cx" style="display: block; padding: 0 10px"> // With sanitize_callback
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'background_color', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'background_color',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => get_theme_support( 'custom-background', 'default-color' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_supports' => 'custom-background',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5118,7 +5170,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_control(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Color_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this, 'background_color', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this,
+ 'background_color',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Background Color' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'colors',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5162,7 +5216,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"> $this->add_section(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'header_image', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'header_image',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => $title,
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => $description,
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_supports' => 'custom-header',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5171,7 +5226,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"> $this->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'header_video', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'header_video',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'theme_supports' => array( 'custom-header', 'video' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'transport' => 'postMessage',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'absint',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5180,7 +5236,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"> $this->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'external_header_video', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'external_header_video',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'theme_supports' => array( 'custom-header', 'video' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'transport' => 'postMessage',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => array( $this, '_sanitize_external_header_video' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5190,7 +5247,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_setting(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Filter_Setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this, 'header_image', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this,
+ 'header_image',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => sprintf( get_theme_support( 'custom-header', 'default-image' ), get_template_directory_uri(), get_stylesheet_directory_uri() ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_supports' => 'custom-header',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5199,7 +5258,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_setting(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Header_Image_Setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this, 'header_image_data', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this,
+ 'header_image_data',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'theme_supports' => 'custom-header',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5217,7 +5278,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_control(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Media_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this, 'header_video', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this,
+ 'header_video',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'theme_supports' => array( 'custom-header', 'video' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Header Video' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => $control_description,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5229,7 +5292,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"> $this->add_control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'external_header_video', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'external_header_video',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'theme_supports' => array( 'custom-header', 'video' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'url',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Or, enter a YouTube URL:' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5241,7 +5305,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_control( new WP_Customize_Header_Image_Control( $this ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->selective_refresh->add_partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'custom_header', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'custom_header',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'selector' => '#wp-custom-header',
</span><span class="cx" style="display: block; padding: 0 10px"> 'render_callback' => 'the_custom_header_markup',
</span><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array( 'header_video', 'external_header_video', 'header_image' ), // The image is used as a video fallback here.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5252,7 +5317,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* Custom Background */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_section(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'background_image', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'background_image',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Background Image' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_supports' => 'custom-background',
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 80,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5260,7 +5326,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"> $this->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'background_image', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'background_image',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => get_theme_support( 'custom-background', 'default-image' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_supports' => 'custom-background',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5269,7 +5336,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_setting(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Background_Image_Setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this, 'background_image_thumb', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this,
+ 'background_image_thumb',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'theme_supports' => 'custom-background',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5279,7 +5348,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_control( new WP_Customize_Background_Image_Control( $this ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'background_preset', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'background_preset',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => get_theme_support( 'custom-background', 'default-preset' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_supports' => 'custom-background',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5287,7 +5357,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"> $this->add_control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'background_preset', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'background_preset',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => _x( 'Preset', 'Background Preset' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'background_image',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'select',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5302,7 +5373,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"> $this->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'background_position_x', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'background_position_x',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => get_theme_support( 'custom-background', 'default-position-x' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_supports' => 'custom-background',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5310,7 +5382,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"> $this->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'background_position_y', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'background_position_y',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => get_theme_support( 'custom-background', 'default-position-y' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_supports' => 'custom-background',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5319,7 +5392,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_control(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Background_Position_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this, 'background_position', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this,
+ 'background_position',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Image Position' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'background_image',
</span><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5331,7 +5406,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"> $this->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'background_size', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'background_size',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => get_theme_support( 'custom-background', 'default-size' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_supports' => 'custom-background',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5339,7 +5415,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"> $this->add_control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'background_size', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'background_size',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Image Size' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'background_image',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'select',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5352,7 +5429,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"> $this->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'background_repeat', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'background_repeat',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => get_theme_support( 'custom-background', 'default-repeat' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_supports' => 'custom-background',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5360,7 +5438,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"> $this->add_control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'background_repeat', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'background_repeat',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Repeat Background Image' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'background_image',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'checkbox',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5368,7 +5447,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"> $this->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'background_attachment', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'background_attachment',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => get_theme_support( 'custom-background', 'default-attachment' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_supports' => 'custom-background',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5376,7 +5456,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"> $this->add_control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'background_attachment', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'background_attachment',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Scroll with Page' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'background_image',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'checkbox',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5398,7 +5479,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"> $this->add_section(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'static_front_page', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'static_front_page',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Homepage Settings' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 120,
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'You can choose what’s displayed on the homepage of your site. It can be posts in reverse chronological order (classic blog), or a fixed/static page. To set a static homepage, you first need to create two Pages. One will become the homepage, and the other will be where your posts are displayed.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5407,7 +5489,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"> $this->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'show_on_front', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'show_on_front',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => get_option( 'show_on_front' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'manage_options',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5415,7 +5498,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"> $this->add_control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'show_on_front', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'show_on_front',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Your homepage displays' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'static_front_page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'radio',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5427,7 +5511,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"> $this->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'page_on_front', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'page_on_front',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'manage_options',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5434,7 +5519,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"> $this->add_control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'page_on_front', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'page_on_front',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Homepage' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'static_front_page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'dropdown-pages',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5443,7 +5529,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"> $this->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'page_for_posts', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'page_for_posts',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'manage_options',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5450,7 +5537,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"> $this->add_control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'page_for_posts', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'page_for_posts',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Posts page' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'static_front_page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'dropdown-pages',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5498,7 +5586,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $section_description .= '</p>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_section(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'custom_css', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'custom_css',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Additional CSS' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 200,
</span><span class="cx" style="display: block; padding: 0 10px"> 'description_hidden' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5507,7 +5596,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"> $custom_css_setting = new WP_Customize_Custom_CSS_Setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this, sprintf( 'custom_css[%s]', get_stylesheet() ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this,
+ sprintf( 'custom_css[%s]', get_stylesheet() ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'edit_css',
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5516,7 +5607,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_control(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Code_Editor_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this, 'custom_css', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this,
+ 'custom_css',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'CSS code' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'custom_css',
</span><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array( 'default' => $custom_css_setting->id ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5659,7 +5752,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme' => $theme->slug,
</span><span class="cx" style="display: block; padding: 0 10px"> '_wpnonce' => wp_create_nonce( 'install-theme_' . $theme->slug ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $update_php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $update_php
</ins><span class="cx" style="display: 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->name = wp_kses( $theme->name, $themes_allowedtags );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5832,7 +5926,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '.mp4' !== substr( $video, -4 ) && '.mov' !== substr( $video, -4 ) ) { // Check for .mp4 or .mov format, which (assuming h.264 encoding) are the only cross-browser-supported formats.
</span><span class="cx" style="display: block; padding: 0 10px"> $validity->add(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'invalid_file_type', sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'invalid_file_type',
+ sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: .mp4, 2: .mov */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Only %1$s or %2$s files may be used for header video. Please convert your video file and try again, or, upload your video to YouTube and link it with the option below.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>.mp4</code>',
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizenavmenusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-nav-menus.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/class-wp-customize-nav-menus.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,7 +180,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"> $posts = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts, get_posts(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts,
+ get_posts(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'numberposts' => 10,
</span><span class="cx" style="display: block; padding: 0 10px"> 'offset' => 10 * $page,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +210,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'taxonomy' === $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $object, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $object,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'child_of' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'exclude' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -363,7 +365,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Query taxonomy terms.
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'names' );
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomies, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $taxonomies,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name__like' => $args['s'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'number' => 20,
</span><span class="cx" style="display: block; padding: 0 10px"> 'offset' => 20 * ( $args['pagenum'] - 1 ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -387,7 +390,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add "Home" link if search term matches. Treat as a page, but switch to custom on add.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args['s'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title = _x( 'Home', 'nav menu home label' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = _x( 'Home', 'nav menu home label' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $matches = function_exists( 'mb_stripos' ) ? false !== mb_stripos( $title, $args['s'] ) : false !== stripos( $title, $args['s'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $matches ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $items[] = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -594,7 +597,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager->add_panel(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Nav_Menus_Panel(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->manager, 'nav_menus', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->manager,
+ 'nav_menus',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Menus' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => $description,
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 100,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -620,7 +625,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"> $this->manager->add_section(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'menu_locations', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'menu_locations',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => 1 === $num_locations ? _x( 'View Location', 'menu locations' ) : _x( 'View All Locations', 'menu locations' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'panel' => 'nav_menus',
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 30,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -656,7 +662,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( "customize_sanitize_{$setting_id}", array( $this, 'intval_base10' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $setting_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $setting_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => array( $this, 'intval_base10' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_supports' => 'menus',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'theme_mod',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -673,7 +680,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager->add_control(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Nav_Menu_Location_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->manager, $setting_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->manager,
+ $setting_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => $description,
</span><span class="cx" style="display: block; padding: 0 10px"> 'location_id' => $location,
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'menu_locations',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -691,7 +700,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $section_id = 'nav_menu[' . $menu_id . ']';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager->add_section(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Nav_Menu_Section(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->manager, $section_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->manager,
+ $section_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => html_entity_decode( $menu->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 10,
</span><span class="cx" style="display: block; padding: 0 10px"> 'panel' => 'nav_menus',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -702,7 +713,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $nav_menu_setting_id = 'nav_menu[' . $menu_id . ']';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager->add_setting(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Nav_Menu_Setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->manager, $nav_menu_setting_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->manager,
+ $nav_menu_setting_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'transport' => 'postMessage',
</span><span class="cx" style="display: block; padding: 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 +737,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $value['nav_menu_term_id'] = $menu_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager->add_setting(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Nav_Menu_Item_Setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->manager, $menu_item_setting_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->manager,
+ $menu_item_setting_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'value' => $value,
</span><span class="cx" style="display: block; padding: 0 10px"> 'transport' => 'postMessage',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -734,7 +749,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a control for each menu item.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager->add_control(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Nav_Menu_Item_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->manager, $menu_item_setting_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->manager,
+ $menu_item_setting_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => $item->title,
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => $section_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 10 + $i,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -748,7 +765,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add the add-new-menu section and controls.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager->add_section(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'add_menu', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'add_menu',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'new_menu',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'New Menu' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'panel' => 'nav_menus',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -758,7 +776,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager->add_setting(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Customize_Filter_Setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->manager, 'nav_menus_created_posts', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->manager,
+ 'nav_menus_created_posts',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'transport' => 'postMessage',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option', // To prevent theme prefix in changeset.
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => array(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1036,7 +1056,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </button>
</span><span class="cx" style="display: block; padding: 0 10px"> </h3>
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</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
</ins><span class="cx" style="display: block; 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">@@ -1094,7 +1114,7 @@
</span><span class="cx" style="display: 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><!-- #available-menu-items -->
</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
</ins><span class="cx" style="display: block; 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">@@ -1120,7 +1140,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Title of a section with menu items */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Toggle section: %s' ), esc_html( $available_item_type['title'] ) );
</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"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="toggle-indicator" aria-hidden="true"></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </button>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/class-wp-customize-widgets.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -401,7 +401,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->manager->is_theme_active() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $setting_id = 'old_sidebars_widgets_data';
</span><span class="cx" style="display: block; padding: 0 10px"> $setting_args = $this->get_setting_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $setting_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $setting_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'global_variable',
</span><span class="cx" style="display: block; padding: 0 10px"> 'dirty' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -410,7 +411,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"> $this->manager->add_panel(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'widgets', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'widgets',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'widgets',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Widgets' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Widgets are independent sections of content that can be placed into widgetized areas provided by your theme (commonly called sidebars).' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -468,7 +470,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager->add_section( $section );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $control = new WP_Widget_Area_Customize_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->manager, $setting_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->manager,
+ $setting_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'section' => $section_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'sidebar_id' => $sidebar_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => count( $sidebar_widget_ids ), // place 'Add Widget' and 'Reorder' buttons at end.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -493,7 +497,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $id_base = $wp_registered_widget_controls[ $widget_id ]['id_base'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $control = new WP_Widget_Form_Customize_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->manager, $setting_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->manager,
+ $setting_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => $registered_widget['name'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => $section_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'sidebar_id' => $sidebar_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -733,7 +739,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $non_rendered_count
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $non_rendered_count )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), ENT_QUOTES, get_bloginfo( 'charset' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ ENT_QUOTES,
+ get_bloginfo( 'charset' )
</ins><span class="cx" style="display: block; 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">@@ -741,7 +749,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $no_areas_shown_message = html_entity_decode(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Your theme has 1 widget area, but this particular page doesn’t display it.' )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), ENT_QUOTES, get_bloginfo( 'charset' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ ENT_QUOTES,
+ get_bloginfo( 'charset' )
</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"> $no_areas_shown_message = html_entity_decode(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -753,7 +763,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $registered_sidebar_count
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $registered_sidebar_count )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), ENT_QUOTES, get_bloginfo( 'charset' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ ENT_QUOTES,
+ get_bloginfo( 'charset' )
</ins><span class="cx" style="display: block; 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">@@ -990,7 +1002,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The properties here are mapped to the Backbone Widget model.
</span><span class="cx" style="display: block; padding: 0 10px"> $available_widget = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $available_widget, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $available_widget,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'temp_id' => isset( $args['_temp_id'] ) ? $args['_temp_id'] : null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'is_multi' => $is_multi_widget,
</span><span class="cx" style="display: block; padding: 0 10px"> 'control_tpl' => $control_tpl,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1703,7 +1716,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'data-customize-partial-placement-context',
</span><span class="cx" style="display: block; padding: 0 10px"> 'data-customize-partial-widget-id',
</span><span class="cx" style="display: block; padding: 0 10px"> 'data-customize-partial-options',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), true
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ true
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/class-wp-editor.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +80,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $settings = apply_filters( 'wp_editor_settings', $settings, $editor_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $set = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $settings, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $settings,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wpautop' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'media_buttons' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'default_editor' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,7 +258,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $output Editor's HTML markup.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $the_editor = apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'the_editor', '<div id="wp-' . $editor_id_attr . '-editor-container" class="wp-editor-container">' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'the_editor',
+ '<div id="wp-' . $editor_id_attr . '-editor-container" class="wp-editor-container">' .
</ins><span class="cx" style="display: block; padding: 0 10px"> $quicktags_toolbar .
</span><span class="cx" style="display: block; padding: 0 10px"> '<textarea' . $editor_class . $height . $tabindex . $autocomplete . ' cols="40" name="' . esc_attr( $set['textarea_name'] ) . '" ' .
</span><span class="cx" style="display: block; padding: 0 10px"> 'id="' . $editor_id_attr . '">%s</textarea></div>'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -791,7 +793,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * and Quicktags are being loaded.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp_enqueue_editor', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp_enqueue_editor',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'tinymce' => ( $default_scripts || self::$has_tinymce ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'quicktags' => ( $default_scripts || self::$has_quicktags ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -847,7 +850,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // The 'wpview', 'wpdialogs', and 'media' TinyMCE plugins are not initialized by default.
</span><span class="cx" style="display: block; padding: 0 10px"> // Can be added from js by using the 'wp-before-tinymce-init' event.
</span><span class="cx" style="display: block; padding: 0 10px"> $settings['plugins'] = implode(
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'charmap',
</span><span class="cx" style="display: block; padding: 0 10px"> 'colorpicker',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hr',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/class-wp-embed.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> jQuery(document).ready(function($){
</span><span class="cx" style="display: block; padding: 0 10px"> $.get("<?php echo admin_url( 'admin-ajax.php?action=oembed-cache&post=' . $post->ID, 'relative' ); ?>");
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesclasswphttpcurlphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-http-curl.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-http-curl.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/class-wp-http-curl.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +189,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->stream_handle ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'http_request_failed', sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'http_request_failed',
+ sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: fopen(), 2: file name */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Could not open handle for %1$s to %2$s.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'fopen()',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/class-wp-http-streams.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -249,7 +249,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $stream_handle ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'http_request_failed', sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'http_request_failed',
+ sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: fopen(), 2: file name */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Could not open handle for %1$s to %2$s.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'fopen()',
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpmetaqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-meta-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-meta-query.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/class-wp-meta-query.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -498,7 +498,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 ( ! in_array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $clause['compare'], array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $clause['compare'],
+ 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></pre></div>
<a id="trunksrcwpincludesclasswpoembedcontrollerphp"></a>
<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-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-oembed-controller.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/class-wp-oembed-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> $maxwidth = apply_filters( 'oembed_default_width', 600 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'oembed/1.0', '/embed', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'oembed/1.0',
+ '/embed',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => WP_REST_Server::READABLE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => array( $this, 'get_item' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +57,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"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'oembed/1.0', '/proxy', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'oembed/1.0',
+ '/proxy',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => WP_REST_Server::READABLE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => array( $this, 'get_proxy_item' ),
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/class-wp-query.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1099,7 +1099,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = preg_split( '/[+]+/', $term );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $terms as $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tax_query[] = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax_query_defaults, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax_query_defaults,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'terms' => array( $term ),
</span><span class="cx" style="display: block; padding: 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 +1107,8 @@
</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"> $tax_query[] = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax_query_defaults, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax_query_defaults,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'terms' => preg_split( '/[,]+/', $term ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1428,7 +1430,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * words into your language. Instead, look for and provide commonly accepted stopwords in your language.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $words = explode(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ',', _x(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ',',
+ _x(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'about,an,are,as,at,be,by,com,for,from,how,in,is,it,of,on,or,that,the,this,to,was,what,when,where,who,will,with,www',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Comma-separated list of search stopwords in your language'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1742,7 +1745,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $q['caller_get_posts'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'WP_Query', '3.1.0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'WP_Query',
+ '3.1.0',
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: caller_get_posts, 2: ignore_sticky_posts */
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( '%1$s is deprecated. Use %2$s instead.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2201,7 +2205,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $q['comment_count'] = array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'compare' => '=',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $q['comment_count']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $q['comment_count']
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Fallback for invalid compare operators is '='.
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/class-wp-rewrite.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1183,7 +1183,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $page ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Require <permalink>/attachment/stuff form for pages because of confusion with subpages.
</span><span class="cx" style="display: block; padding: 0 10px"> $rewrite = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $rewrite, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $rewrite,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> $sub1 => $subquery,
</span><span class="cx" style="display: block; padding: 0 10px"> $sub1tb => $subtbquery,
</span><span class="cx" style="display: block; padding: 0 10px"> $sub1feed => $subfeedquery,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1202,7 +1203,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sub2feed2 => $subfeedquery,
</span><span class="cx" style="display: block; padding: 0 10px"> $sub2comment => $subcommentquery,
</span><span class="cx" style="display: block; padding: 0 10px"> $sub2embed => $subembedquery,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $rewrite
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $rewrite
</ins><span class="cx" style="display: block; 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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/class-wp-tax-query.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -470,7 +470,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ON $wpdb->term_taxonomy.term_taxonomy_id = $wpdb->term_relationships.term_taxonomy_id
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE $wpdb->term_taxonomy.taxonomy = %s
</span><span class="cx" style="display: block; padding: 0 10px"> AND $wpdb->term_relationships.object_id = $this->primary_table.$this->primary_id_column
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- )", $clause['taxonomy']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ )",
+ $clause['taxonomy']
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/class-wp-taxonomy.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,7 +296,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $args['rewrite'] && ( is_admin() || '' != get_option( 'permalink_structure' ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['rewrite'] = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args['rewrite'], array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args['rewrite'],
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'with_front' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'ep_mask' => EP_NONE,
</span></span></pre></div>
<a id="trunksrcwpincludesclasswptermqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-term-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-term-query.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/class-wp-term-query.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> $excluded_children = array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> $excluded_children,
</span><span class="cx" style="display: block; padding: 0 10px"> (array) get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- reset( $taxonomies ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ reset( $taxonomies ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'child_of' => intval( $extrunk ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => 0,
</span></span></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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/class-wp-theme.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,7 +231,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $this->template = $this->stylesheet;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->cache_add(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'theme', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'theme',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'headers' => $this->headers,
</span><span class="cx" style="display: block; padding: 0 10px"> 'errors' => $this->errors,
</span><span class="cx" style="display: block; padding: 0 10px"> 'stylesheet' => $this->stylesheet,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,7 +248,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->errors = new WP_Error( 'theme_stylesheet_not_readable', __( 'Stylesheet is not readable.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->template = $this->stylesheet;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->cache_add(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'theme', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'theme',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'headers' => $this->headers,
</span><span class="cx" style="display: block; padding: 0 10px"> 'errors' => $this->errors,
</span><span class="cx" style="display: block; padding: 0 10px"> 'stylesheet' => $this->stylesheet,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,7 +272,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Template */
</span><span class="cx" style="display: block; padding: 0 10px"> $this->errors = new WP_Error( 'theme_child_invalid', sprintf( __( 'The theme defines itself as its parent theme. Please check the %s header.' ), '<code>Template</code>' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->cache_add(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'theme', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'theme',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'headers' => $this->headers,
</span><span class="cx" style="display: block; padding: 0 10px"> 'errors' => $this->errors,
</span><span class="cx" style="display: block; padding: 0 10px"> 'stylesheet' => $this->stylesheet,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,7 +296,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->errors = new WP_Error( 'theme_no_index', $error_message );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->cache_add(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'theme', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'theme',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'headers' => $this->headers,
</span><span class="cx" style="display: block; padding: 0 10px"> 'errors' => $this->errors,
</span><span class="cx" style="display: block; padding: 0 10px"> 'stylesheet' => $this->stylesheet,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,7 +323,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Parent theme is missing.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->errors = new WP_Error( 'theme_no_parent', sprintf( __( 'The parent theme is missing. Please install the "%s" parent theme.' ), esc_html( $this->template ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->cache_add(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'theme', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'theme',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'headers' => $this->headers,
</span><span class="cx" style="display: block; padding: 0 10px"> 'errors' => $this->errors,
</span><span class="cx" style="display: block; padding: 0 10px"> 'stylesheet' => $this->stylesheet,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -338,7 +343,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_child->parent = null;
</span><span class="cx" style="display: block; padding: 0 10px"> $_child->errors = new WP_Error( 'theme_parent_invalid', sprintf( __( 'The "%s" theme is not a valid parent theme.' ), esc_html( $_child->template ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $_child->cache_add(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'theme', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'theme',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'headers' => $_child->headers,
</span><span class="cx" style="display: block; padding: 0 10px"> 'errors' => $_child->errors,
</span><span class="cx" style="display: block; padding: 0 10px"> 'stylesheet' => $_child->stylesheet,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -349,7 +355,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $_child->stylesheet == $this->template ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->errors = new WP_Error( 'theme_parent_invalid', sprintf( __( 'The "%s" theme is not a valid parent theme.' ), esc_html( $this->template ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->cache_add(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'theme', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'theme',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'headers' => $this->headers,
</span><span class="cx" style="display: block; padding: 0 10px"> 'errors' => $this->errors,
</span><span class="cx" style="display: block; padding: 0 10px"> 'stylesheet' => $this->stylesheet,
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/class-wp-user.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -239,7 +239,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $user = $wpdb->get_row(
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->prepare(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "SELECT * FROM $wpdb->users WHERE $db_field = %s", $value
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "SELECT * FROM $wpdb->users WHERE $db_field = %s",
+ $value
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,7 +262,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function __isset( $key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'id' == $key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'WP_User->id', '2.1.0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'WP_User->id',
+ '2.1.0',
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: WP_User->ID */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Use %s instead.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,7 +295,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function __get( $key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'id' == $key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'WP_User->id', '2.1.0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'WP_User->id',
+ '2.1.0',
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: WP_User->ID */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Use %s instead.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -333,7 +336,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function __set( $key, $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'id' == $key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'WP_User->id', '2.1.0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'WP_User->id',
+ '2.1.0',
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: WP_User->ID */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Use %s instead.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -357,7 +361,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function __unset( $key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'id' == $key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'WP_User->id', '2.1.0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'WP_User->id',
+ '2.1.0',
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: WP_User->ID */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Use %s instead.' ),
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/class-wp-widget.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,7 +164,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->name = $name;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->option_name = 'widget_' . $this->id_base;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->widget_options = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $widget_options, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $widget_options,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'classname' => $this->option_name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'customize_selective_refresh' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1555,7 +1555,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ambiguous_terms = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_taxonomy_hierarchical( $taxonomy ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tax_term_names = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'names',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6839,8 +6840,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_type = 'pingback';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $commentdata = compact(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'comment_post_ID', 'comment_author', 'comment_author_url', 'comment_author_email',
- 'comment_content', 'comment_type', 'remote_source', 'remote_source_original'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'comment_post_ID',
+ 'comment_author',
+ 'comment_author_url',
+ 'comment_author_email',
+ 'comment_content',
+ 'comment_type',
+ 'remote_source',
+ 'remote_source_original'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ID = wp_new_comment( $commentdata );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/comment-template.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1152,7 +1152,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function trackback_url( $deprecated_echo = true ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( true !== $deprecated_echo ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __FUNCTION__, '2.5.0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __FUNCTION__,
+ '2.5.0',
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: get_trackback_url() */
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Use %s instead if you do not want the value echoed.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1676,16 +1677,16 @@
</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"> $data_attributes = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'commentid' => $comment->comment_ID,
- 'postid' => $post->ID,
- 'belowelement' => $args['add_below'] . '-' . $comment->comment_ID,
- 'respondelement' => $args['respond_id'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'commentid' => $comment->comment_ID,
+ 'postid' => $post->ID,
+ 'belowelement' => $args['add_below'] . '-' . $comment->comment_ID,
+ 'respondelement' => $args['respond_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"> $data_attribute_string = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $data_attributes as $name => $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data_attribute_string .= " data-${name}=\"" . esc_attr( $value ) . "\"";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data_attribute_string .= " data-${name}=\"" . esc_attr( $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"> $data_attribute_string = trim( $data_attribute_string );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1692,7 +1693,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $link = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> "<a rel='nofollow' class='comment-reply-link' href='%s' %s aria-label='%s'>%s</a>",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_url( add_query_arg( 'replytocom', $comment->comment_ID ) ) . "#" . $args['respond_id'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_url( add_query_arg( 'replytocom', $comment->comment_ID ) ) . '#' . $args['respond_id'],
</ins><span class="cx" style="display: block; padding: 0 10px"> $data_attribute_string,
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( sprintf( $args['reply_to_text'], $comment->comment_author ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> $args['reply_text']
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1779,7 +1780,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $onclick = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> 'return addComment.moveForm( "%1$s-%2$s", "0", "%3$s", "%2$s" )',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args['add_below'], $post->ID, $args['respond_id']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args['add_below'],
+ $post->ID,
+ $args['respond_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"> $link = sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2263,11 +2266,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $html_req = ( $req ? " required='required'" : '' );
</span><span class="cx" style="display: block; padding: 0 10px"> $html5 = 'html5' === $args['format'];
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" maxlength="245"' . $html_req . ' /></p>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'email' => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'email' => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<input id="email" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_email'] ) . '" size="30" maxlength="100" aria-describedby="email-notes"' . $html_req . ' /></p>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'url' => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label> ' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'url' => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label> ' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" maxlength="200" /></p>',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2376,7 +2379,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'comment_form_must_log_in_after' );
</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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <form action="<?php echo esc_url( $args['action'] ); ?>" method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>" class="<?php echo esc_attr( $args['class_form'] ); ?>"<?php echo $html5 ? ' novalidate' : ''; ?>>
</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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/comment.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -381,7 +381,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> FROM {$wpdb->comments}
</span><span class="cx" style="display: block; padding: 0 10px"> {$where}
</span><span class="cx" style="display: block; padding: 0 10px"> GROUP BY comment_approved
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ", ARRAY_A
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ",
+ ARRAY_A
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_count = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2520,7 +2521,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"> $response = wp_safe_remote_head(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'timeout' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'httpversion' => '1.0',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2541,7 +2543,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="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)
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_safe_remote_get(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'timeout' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'httpversion' => '1.0',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2656,7 +2659,9 @@
</span><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"> "UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '')) WHERE ID = %d", $tb_ping, $post->ID
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '')) WHERE ID = %d",
+ $tb_ping,
+ $post->ID
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/cron.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> * @param string $doing_wp_cron The unix timestamp of the cron lock.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $cron_request = apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'cron_request', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'cron_request',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'url' => add_query_arg( 'doing_wp_cron', $doing_wp_cron, site_url( 'wp-cron.php' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'key' => $doing_wp_cron,
</span><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -701,7 +702,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/class-wp-http-streams.php */
</span><span class="cx" style="display: block; padding: 0 10px"> 'sslverify' => apply_filters( 'https_local_ssl_verify', 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">- ), $doing_wp_cron
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $doing_wp_cron
</ins><span class="cx" style="display: 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_remote_post( $cron_request['url'], $cron_request['args'] );
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizebackgroundimagecontrolphp"></a>
<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-background-image-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-background-image-control.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/customize/class-wp-customize-background-image-control.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct( $manager ) {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::__construct(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $manager, 'background_image', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $manager,
+ 'background_image',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Background Image' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'background_image',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +46,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $custom_background = get_theme_support( 'custom-background' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'customize-controls', '_wpCustomizeBackground', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'customize-controls',
+ '_wpCustomizeBackground',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'defaults' => ! empty( $custom_background[0] ) ? $custom_background[0] : array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'nonces' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'add' => wp_create_nonce( 'background-add' ),
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizecustomcsssettingphp"></a>
<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-custom-css-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-custom-css-setting.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/customize/class-wp-customize-custom-css-setting.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,7 +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"> $r = wp_update_custom_css_post(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $css, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $css,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'stylesheet' => $this->stylesheet,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizeheaderimagecontrolphp"></a>
<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-header-image-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-header-image-control.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/customize/class-wp-customize-header-image-control.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct( $manager ) {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::__construct(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $manager, 'header_image', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $manager,
+ 'header_image',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Header Image' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => 'header_image',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +53,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->prepare_control();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'customize-views', '_wpCustomizeHeader', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'customize-views',
+ '_wpCustomizeHeader',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'data' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => absint( get_theme_support( 'custom-header', 'width' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => absint( get_theme_support( 'custom-header', 'height' ) ),
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizenavmenuitemsettingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,7 +353,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $this->value['nav_menu_term_id'] ) && $this->post_id > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menus = wp_get_post_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->post_id, WP_Customize_Nav_Menu_Setting::TAXONOMY, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->post_id,
+ WP_Customize_Nav_Menu_Setting::TAXONOMY,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => '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">@@ -557,7 +559,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ARRAY_A === $args['output'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $items = wp_list_sort(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $items, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $items,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['output_key'] => '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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -269,7 +269,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'term_group' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => self::TAXONOMY,
</span><span class="cx" style="display: block; padding: 0 10px"> 'filter' => 'raw',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $setting_value
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $setting_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"> array_splice( $menus, $index, ( -1 === $index ? 0 : 1 ), array( $menu_obj ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -278,7 +279,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure the menu objects get re-sorted after an update/insert.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $is_delete && ! empty( $args['orderby'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menus = wp_list_sort(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menus, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menus,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['orderby'] => '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">@@ -366,7 +368,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'term_group' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => self::TAXONOMY,
</span><span class="cx" style="display: block; padding: 0 10px"> 'filter' => 'raw',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $setting_value
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $setting_value
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $menu_obj;
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizenavmenuspanelphp"></a>
<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-menus-panel.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-menus-panel.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/customize/class-wp-customize-nav-menus-panel.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,6 +96,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // NOTE: The following is a workaround for an inability to treat (and thus label) a list of sections as a whole.
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="customize-control-title customize-section-title-nav_menus-heading"><?php _e( 'Menus' ); ?></li>
</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
</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="trunksrcwpincludescustomizeclasswpcustomizethemecontrolphp"></a>
<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-theme-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-theme-control.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/customize/class-wp-customize-theme-control.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,6 +130,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</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
</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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/default-filters.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -380,7 +380,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> // Redirect Old Dates
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'post_updated', 'wp_check_for_changed_dates', 12, 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'post_updated', 'wp_check_for_changed_dates', 12, 3 );
</ins><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><span class="cx" style="display: block; padding: 0 10px"> // Nonce check for Post Previews
</span></span></pre></div>
<a id="trunksrcwpincludesembedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/embed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/embed.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/embed.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -401,7 +401,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => urlencode( $permalink ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'format' => ( 'json' !== $format ) ? $format : false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $url
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $url
</ins><span class="cx" style="display: block; 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">@@ -522,7 +523,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"> $min_max_width = apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'oembed_min_max_width', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'oembed_min_max_width',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'min' => 200,
</span><span class="cx" style="display: block; padding: 0 10px"> 'max' => 600,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1082,7 +1084,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url_parts = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_parse_url( $url ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_parse_url( $url ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'host' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'path' => '/',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/feed-atom-comments.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> while ( have_comments() ) :
</span><span class="cx" style="display: block; padding: 0 10px"> the_comment();
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_post = $GLOBALS['post'] = get_post( $comment->comment_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">+ ?>
</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">@@ -90,7 +90,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Comment author title. %s: Comment author name */
</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><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"> </title>
</span><span class="cx" style="display: block; padding: 0 10px"> <link rel="alternate" href="<?php comment_link(); ?>" type="<?php bloginfo_rss( 'html_type' ); ?>" />
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_comment_author_url() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<uri>' . get_comment_author_url() . '</uri>';}
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> </author>
</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"> <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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( post_password_required( $comment_post ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( post_password_required( $comment_post ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php echo get_the_password_form(); ?>]]></content>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : // post pass ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php comment_text(); ?>]]></content>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,9 +120,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> else : // This comment is in reply to another comment
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_comment = get_comment( $comment->comment_parent );
</span><span class="cx" style="display: block; padding: 0 10px"> // 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
</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"> <thr:in-reply-to ref="<?php comment_guid( $parent_comment ); ?>" href="<?php echo get_comment_link( $parent_comment ); ?>" type="<?php bloginfo_rss( 'html_type' ); ?>" />
</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
</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"> * Fires at the end of each Atom comment feed item.
</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"> do_action( 'comment_atom_entry', $comment->comment_ID, $comment_post->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> endwhile;
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span></span></pre></div>
<a id="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/feed-atom.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> while ( have_posts() ) :
</span><span class="cx" style="display: block; padding: 0 10px"> the_post();
</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"> <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><span class="cx" style="display: block; padding: 0 10px"> <?php $author_url = get_the_author_meta( 'url' ); if ( ! empty( $author_url ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <uri><?php the_author_meta( 'url' ); ?></uri>
</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
</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"> /**
</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"> * @since 3.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'atom_author' );
</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"> </author>
</span><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,24 +75,24 @@
</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><span class="cx" style="display: block; padding: 0 10px"> <summary type="<?php html_type_rss(); ?>"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( ! get_option( 'rss_use_excerpt' ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! get_option( 'rss_use_excerpt' ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <content type="<?php html_type_rss(); ?>" xml:base="<?php the_permalink_rss(); ?>"><![CDATA[<?php the_content_feed( 'atom' ); ?>]]></content>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endif; ?>
- <?php
- atom_enclosure();
- /**
- * Fires at the end of each Atom feed item.
- *
- * @since 2.0.0
- */
- do_action( 'atom_entry' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endif; ?>
+ <?php
+ atom_enclosure();
+ /**
+ * Fires at the end of each Atom feed item.
+ *
+ * @since 2.0.0
+ */
+ do_action( 'atom_entry' );
</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 ( get_comments_number() || comments_open() ) :
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_comments_number() || comments_open() ) :
+ ?>
</ins><span class="cx" style="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(); ?>"/>
</span><span class="cx" style="display: block; padding: 0 10px"> <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(); ?>"/>
</span><span class="cx" style="display: block; padding: 0 10px"> <thr:total><?php echo get_comments_number(); ?></thr:total>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php endif; ?>
</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"> </entry>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </feed>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/feed-rdf.php 2018-08-17 01:50:26 UTC (rev 43571)
</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
</span><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><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"> <rdf:li rdf:resource="<?php the_permalink_rss(); ?>"/>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </rdf:Seq>
</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"> rewind_posts();
</span><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><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"> <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><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"> <dc:date><?php echo mysql2date( 'Y-m-d\TH:i:s\Z', $post->post_date_gmt, false ); ?></dc:date>
</span><span class="cx" style="display: block; padding: 0 10px"> <dc:creator><![CDATA[<?php the_author(); ?>]]></dc:creator>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_category_rss( 'rdf' ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( get_option( 'rss_use_excerpt' ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( get_option( 'rss_use_excerpt' ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/feed-rss.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><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><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"> <item>
</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"> <description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/feed-rss2-comments.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <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 ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( post_password_required( $comment_post ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <description><?php echo ent2ncr( __( 'Protected Comments: Please enter your password to view comments.' ) ); ?></description>
</span><span class="cx" style="display: block; padding: 0 10px"> <content:encoded><![CDATA[<?php echo get_the_password_form(); ?>]]></content:encoded>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : // post pass ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,11 +116,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $comment_post->ID The ID of the post the comment is connected to.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'commentrss2_item', $comment->comment_ID, $comment_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">+?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </item>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> endwhile;
</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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/feed-rss2.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,42 +89,42 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><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><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"> <item>
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( get_comments_number() || comments_open() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( get_comments_number() || comments_open() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <comments><?php comments_link_feed(); ?></comments>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endif; ?>
</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"> <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><span class="cx" style="display: block; padding: 0 10px"> <dc:creator><![CDATA[<?php the_author(); ?>]]></dc:creator>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_category_rss( 'rss2' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <guid isPermaLink="false"><?php the_guid(); ?></guid>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( get_option( 'rss_use_excerpt' ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( get_option( 'rss_use_excerpt' ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>
</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"> <description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $content = get_the_content_feed( 'rss2' ); ?>
- <?php if ( strlen( $content ) > 0 ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $content = get_the_content_feed( 'rss2' ); ?>
+ <?php if ( strlen( $content ) > 0 ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <content:encoded><![CDATA[<?php echo $content; ?>]]></content:encoded>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <content:encoded><![CDATA[<?php the_excerpt_rss(); ?>]]></content:encoded>
</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 endif; ?>
-<?php if ( get_comments_number() || comments_open() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endif; ?>
+ <?php if ( get_comments_number() || comments_open() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <wfw:commentRss><?php echo esc_url( get_post_comments_feed_link( null, 'rss2' ) ); ?></wfw:commentRss>
</span><span class="cx" style="display: block; padding: 0 10px"> <slash:comments><?php echo get_comments_number(); ?></slash:comments>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endif; ?>
-<?php rss_enclosure(); ?>
- <?php
- /**
- * Fires at the end of each RSS2 feed item.
- *
- * @since 2.0.0
- */
- do_action( 'rss2_item' );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endif; ?>
+ <?php rss_enclosure(); ?>
+ <?php
+ /**
+ * Fires at the end of each RSS2 feed item.
+ *
+ * @since 2.0.0
+ */
+ do_action( 'rss2_item' );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </item>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </channel>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/formatting.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +130,8 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ',', _x(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ',',
+ _x(
</ins><span class="cx" style="display: block; padding: 0 10px"> "'tain't,'twere,'twas,'tis,'twill,'til,'bout,'nuff,'round,'cause,'em",
</span><span class="cx" style="display: block; padding: 0 10px"> 'Comma-separated list of words to texturize in your language'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,7 +138,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"> $cockneyreplace = explode(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ',', _x(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ',',
+ _x(
</ins><span class="cx" style="display: block; padding: 0 10px"> '’tain’t,’twere,’twas,’tis,’twill,’til,’bout,’nuff,’round,’cause,’em',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Comma-separated list of replacement words in your language'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2262,7 +2264,9 @@
</span><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><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"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Convert times to x
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3072,12 +3076,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 ( ! empty( $rel_match[0] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parts = preg_split( '|\s+|', strtolower( $rel_match[2] ) );
- $parts = array_map( 'esc_attr', $parts );
- $needed = explode( ' ', $rel );
- $parts = array_unique( array_merge( $parts, $needed ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parts = preg_split( '|\s+|', strtolower( $rel_match[2] ) );
+ $parts = array_map( 'esc_attr', $parts );
+ $needed = explode( ' ', $rel );
+ $parts = array_unique( array_merge( $parts, $needed ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $delimiter = trim( $rel_match[1] ) ? $rel_match[1] : '"';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $rel = 'rel=' . $delimiter . trim( implode( ' ', $parts ) ) . $delimiter;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $rel = 'rel=' . $delimiter . trim( implode( ' ', $parts ) ) . $delimiter;
</ins><span class="cx" style="display: block; padding: 0 10px"> $link_html = str_replace( $rel_match[0], $rel, $link_html );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $link_html .= " rel=\"$rel\"";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4843,7 +4847,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $delimiters An array of translated delimiters.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $l = apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp_sprintf_l', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp_sprintf_l',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: used to join items in a list with more than 2 items */
</span><span class="cx" style="display: block; padding: 0 10px"> 'between' => sprintf( __( '%1$s, %2$s' ), '', '' ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: used to join last two items in a list with more than 2 times */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5336,7 +5341,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $printed = true;
</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"> <style type="text/css">
</span><span class="cx" style="display: block; padding: 0 10px"> img.wp-smiley,
</span><span class="cx" style="display: block; padding: 0 10px"> img.emoji {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5351,7 +5356,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 0 !important;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> </style>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/functions.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,8 +107,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $req_format = $dateformatstring;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $dateformatstring = preg_replace( "/(?<!\\\\)c/", DATE_W3C, $dateformatstring );
- $dateformatstring = preg_replace( "/(?<!\\\\)r/", DATE_RFC2822, $dateformatstring );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $dateformatstring = preg_replace( '/(?<!\\\\)c/', DATE_W3C, $dateformatstring );
+ $dateformatstring = preg_replace( '/(?<!\\\\)r/', DATE_RFC2822, $dateformatstring );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( ! empty( $wp_locale->month ) ) && ( ! empty( $wp_locale->weekday ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $datemonth = $wp_locale->get_month( date( 'm', $i ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1821,7 +1821,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wrapper = '';
</span><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><span class="cx" style="display: block; padding: 0 10px"> // Standardise all paths to use /
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2292,7 +2292,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $upload_bits_error An array of upload bits data, or a non-array error to return.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $upload_bits_error = apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp_upload_bits', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp_upload_bits',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => $name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'bits' => $bits,
</span><span class="cx" style="display: block; padding: 0 10px"> 'time' => $time,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2342,12 +2343,14 @@
</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="cx" style="display: block; padding: 0 10px"> return apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp_handle_upload', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp_handle_upload',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'file' => $new_file,
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => $url,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => $wp_filetype['type'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'error' => false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'sideload'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'sideload'
</ins><span class="cx" style="display: block; 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">@@ -2449,7 +2452,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $mime_to_ext Array of image mime types and their matching extensions.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $mime_to_ext = apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'getimagesize_mimes_to_exts', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'getimagesize_mimes_to_exts',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'image/jpeg' => 'jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'image/png' => 'png',
</span><span class="cx" style="display: block; padding: 0 10px"> 'image/gif' => 'gif',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2568,7 +2572,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * corresponding to those types.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mime_types', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mime_types',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> // Image formats.
</span><span class="cx" style="display: block; padding: 0 10px"> 'jpg|jpeg|jpe' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'gif' => 'image/gif',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2694,7 +2699,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * of file types.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'ext2type', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'ext2type',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'image' => array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'audio' => array( 'aac', 'ac3', 'aif', 'aiff', 'flac', 'm3a', 'm4a', 'm4b', 'mka', 'mp1', 'mp2', 'mp3', 'ogg', 'oga', 'ram', 'wav', 'wma' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'video' => array( '3g2', '3gp', '3gpp', 'asf', 'avi', 'divx', 'dv', 'flv', 'm4v', 'mkv', 'mov', 'mp4', 'mpeg', 'mpg', 'mpv', 'ogm', 'ogv', 'qt', 'rm', 'vob', 'wmv' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2926,17 +2932,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $dir_attr = "dir='$text_direction'";
</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"> <!DOCTYPE html>
</span><span class="cx" style="display: block; padding: 0 10px"> <html xmlns="http://www.w3.org/1999/xhtml" <?php echo $dir_attr; ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <head>
</span><span class="cx" style="display: block; padding: 0 10px"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
</span><span class="cx" style="display: block; padding: 0 10px"> <meta name="viewport" content="width=device-width">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- if ( function_exists( 'wp_no_robots' ) ) {
- wp_no_robots();
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( function_exists( 'wp_no_robots' ) ) {
+ wp_no_robots();
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <title><?php echo $title; ?></title>
</span><span class="cx" style="display: block; padding: 0 10px"> <style type="text/css">
</span><span class="cx" style="display: block; padding: 0 10px"> html {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3060,7 +3066,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $message; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </body>
</span><span class="cx" style="display: block; padding: 0 10px"> </html>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> die();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3346,7 +3352,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( wp_doing_ajax() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '', '', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '',
+ '',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'response' => 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">@@ -3963,7 +3971,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_rtl() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $dir_attr = ' dir="rtl"';
</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"> <!DOCTYPE html>
</span><span class="cx" style="display: block; padding: 0 10px"> <html xmlns="http://www.w3.org/1999/xhtml"<?php echo $dir_attr; ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <head>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3975,7 +3983,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h1><?php _e( 'Error establishing a database connection' ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> </body>
</span><span class="cx" style="display: block; padding: 0 10px"> </html>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> die();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4098,7 +4106,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> trigger_error(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The called constructor method for %1$s in %2$s is <strong>deprecated</strong> since version %3$s! Use %4$s instead.' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class, $parent_class, $version, '<pre>__construct()</pre>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class,
+ $parent_class,
+ $version,
+ '<pre>__construct()</pre>'
</ins><span class="cx" style="display: 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">@@ -4106,7 +4117,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> trigger_error(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The called constructor method for %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class, $version, '<pre>__construct()</pre>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class,
+ $version,
+ '<pre>__construct()</pre>'
</ins><span class="cx" style="display: block; 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">@@ -4115,7 +4128,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> trigger_error(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> 'The called constructor method for %1$s in %2$s is <strong>deprecated</strong> since version %3$s! Use %4$s instead.',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class, $parent_class, $version, '<pre>__construct()</pre>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class,
+ $parent_class,
+ $version,
+ '<pre>__construct()</pre>'
</ins><span class="cx" style="display: 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">@@ -4122,7 +4138,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> trigger_error(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> 'The called constructor method for %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class, $version, '<pre>__construct()</pre>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class,
+ $version,
+ '<pre>__construct()</pre>'
</ins><span class="cx" style="display: block; 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">@@ -5467,7 +5485,7 @@
</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="cx" style="display: block; padding: 0 10px"> wp_normalize_path( WP_CONTENT_DIR ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_normalize_path( ABSPATH )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_normalize_path( ABSPATH ),
</ins><span class="cx" style="display: block; 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">@@ -5666,7 +5684,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'interim-login' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_lang' => get_user_locale(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $login_url
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $login_url
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="wp-auth-check-form" class="loading" data-src="<?php echo esc_url( $login_src ); ?>"></div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5865,7 +5884,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True on success, false on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_delete_file_from_directory( $file, $directory ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $real_file = realpath( wp_normalize_path( $file ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $real_file = realpath( wp_normalize_path( $file ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $real_directory = realpath( wp_normalize_path( $directory ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $real_file || false === $real_directory || strpos( wp_normalize_path( $real_file ), trailingslashit( wp_normalize_path( $real_directory ) ) ) !== 0 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6048,11 +6067,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_generate_uuid4() {
</span><span class="cx" style="display: block; padding: 0 10px"> return sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ),
</del><span class="cx" style="display: block; padding: 0 10px"> mt_rand( 0, 0xffff ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ mt_rand( 0, 0xffff ),
+ mt_rand( 0, 0xffff ),
</ins><span class="cx" style="display: block; padding: 0 10px"> mt_rand( 0, 0x0fff ) | 0x4000,
</span><span class="cx" style="display: block; padding: 0 10px"> mt_rand( 0, 0x3fff ) | 0x8000,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ mt_rand( 0, 0xffff ),
+ mt_rand( 0, 0xffff ),
+ mt_rand( 0, 0xffff )
</ins><span class="cx" style="display: block; 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">@@ -6190,10 +6212,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $email_change_email['message'] = str_replace( '###SITEURL###', home_url(), $email_change_email['message'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_mail(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $email_change_email['to'], sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $email_change_email['to'],
+ sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> $email_change_email['subject'],
</span><span class="cx" style="display: block; padding: 0 10px"> $site_name
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $email_change_email['message'], $email_change_email['headers']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $email_change_email['message'],
+ $email_change_email['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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6249,7 +6274,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Partially anonymize the IP by reducing it to the corresponding network ID.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'inet_pton' ) && function_exists( 'inet_ntop' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ip_addr = inet_ntop( inet_pton( $ip_addr ) & inet_pton( $netmask ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === $ip_addr) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === $ip_addr ) {
</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"> } elseif ( ! $ipv6_fallback ) {
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/functions.wp-scripts.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,13 +39,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"> _doing_it_wrong(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $function, sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $function,
+ sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: wp_enqueue_scripts, 2: admin_enqueue_scripts, 3: login_enqueue_scripts */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp_enqueue_scripts</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>admin_enqueue_scripts</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>login_enqueue_scripts</code>'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), '3.3.0'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ '3.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">@@ -111,12 +113,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== stripos( $data, '</script>' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __FUNCTION__, sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __FUNCTION__,
+ sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: <script>, 2: wp_add_inline_script() */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Do not pass %1$s tags to %2$s.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code><script></code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp_add_inline_script()</code>'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), '4.5.0'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ '4.5.0'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = trim( preg_replace( '#<script[^>]*>(.*)</script>#is', '$1', $data ) );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/functions.wp-styles.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,12 +85,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== stripos( $data, '</style>' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __FUNCTION__, sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __FUNCTION__,
+ sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: <style>, 2: wp_add_inline_style() */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Do not pass %1$s tags to %2$s.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code><style></code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp_add_inline_style()</code>'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), '3.7.0'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ '3.7.0'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = trim( preg_replace( '#<style[^>]*>(.*)</style>#is', '$1', $data ) );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/general-template.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -645,7 +645,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'home': // DEPRECATED
</span><span class="cx" style="display: block; padding: 0 10px"> case 'siteurl': // DEPRECATED
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __FUNCTION__, '2.2.0', sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __FUNCTION__,
+ '2.2.0',
+ sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: 'siteurl'/'home' argument, 2: bloginfo() function name, 3: 'url' argument */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The %1$s option is deprecated for the family of %2$s functions. Use the %3$s option instead.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . $show . '</code>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -722,7 +724,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'text_direction':
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __FUNCTION__, '2.2.0', sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __FUNCTION__,
+ '2.2.0',
+ sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: 'text_direction' argument, 2: bloginfo() function name, 3: is_rtl() function name */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The %1$s option is deprecated for the family of %2$s functions. Use the %3$s function instead.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . $show . '</code>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1886,7 +1890,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'm' => $arc_year,
</span><span class="cx" style="display: block; padding: 0 10px"> 'w' => $result->week,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), home_url( '/' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ home_url( '/' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'post' !== $r['post_type'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg( 'post_type', $r['post_type'], $url );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2106,7 +2111,8 @@
</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="cx" style="display: block; padding: 0 10px"> AND post_type = 'post' AND post_status = 'publish'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- AND post_date <= '{$thisyear}-{$thismonth}-{$last_day} 23:59:59'", ARRAY_N
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ AND post_date <= '{$thisyear}-{$thismonth}-{$last_day} 23:59:59'",
+ ARRAY_N
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $dayswithposts ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $dayswithposts as $daywith ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3359,7 +3365,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'text/css' === $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $settings['codemirror'] = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $settings['codemirror'], array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $settings['codemirror'],
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mode' => 'css',
</span><span class="cx" style="display: block; padding: 0 10px"> 'lint' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'autoCloseBrackets' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3368,7 +3375,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'text/x-scss' === $type || 'text/x-less' === $type || 'text/x-sass' === $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $settings['codemirror'] = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $settings['codemirror'], array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $settings['codemirror'],
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mode' => $type,
</span><span class="cx" style="display: block; padding: 0 10px"> 'lint' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'autoCloseBrackets' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3377,13 +3385,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'text/x-diff' === $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $settings['codemirror'] = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $settings['codemirror'], array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $settings['codemirror'],
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mode' => 'diff',
</span><span class="cx" style="display: 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 ( 'text/html' === $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $settings['codemirror'] = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $settings['codemirror'], array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $settings['codemirror'],
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mode' => 'htmlmixed',
</span><span class="cx" style="display: block; padding: 0 10px"> 'lint' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'autoCloseBrackets' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3399,7 +3409,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'text/x-gfm' === $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $settings['codemirror'] = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $settings['codemirror'], array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $settings['codemirror'],
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mode' => 'gfm',
</span><span class="cx" style="display: block; padding: 0 10px"> 'highlightFormatting' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3406,7 +3417,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'application/javascript' === $type || 'text/javascript' === $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $settings['codemirror'] = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $settings['codemirror'], array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $settings['codemirror'],
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mode' => 'javascript',
</span><span class="cx" style="display: block; padding: 0 10px"> 'lint' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'autoCloseBrackets' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3415,7 +3427,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( false !== strpos( $type, 'json' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $settings['codemirror'] = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $settings['codemirror'], array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $settings['codemirror'],
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mode' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'javascript',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3431,7 +3444,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( false !== strpos( $type, 'jsx' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $settings['codemirror'] = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $settings['codemirror'], array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $settings['codemirror'],
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mode' => 'jsx',
</span><span class="cx" style="display: block; padding: 0 10px"> 'autoCloseBrackets' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'matchBrackets' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3439,7 +3453,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'text/x-markdown' === $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $settings['codemirror'] = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $settings['codemirror'], array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $settings['codemirror'],
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mode' => 'markdown',
</span><span class="cx" style="display: block; padding: 0 10px"> 'highlightFormatting' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3446,13 +3461,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'text/nginx' === $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $settings['codemirror'] = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $settings['codemirror'], array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $settings['codemirror'],
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mode' => 'nginx',
</span><span class="cx" style="display: 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 ( 'application/x-httpd-php' === $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $settings['codemirror'] = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $settings['codemirror'], array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $settings['codemirror'],
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mode' => 'php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'autoCloseBrackets' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'autoCloseTags' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3464,7 +3481,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'text/x-sql' === $type || 'text/x-mysql' === $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $settings['codemirror'] = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $settings['codemirror'], array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $settings['codemirror'],
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mode' => 'sql',
</span><span class="cx" style="display: block; padding: 0 10px"> 'autoCloseBrackets' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'matchBrackets' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3472,7 +3490,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( false !== strpos( $type, 'xml' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $settings['codemirror'] = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $settings['codemirror'], array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $settings['codemirror'],
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mode' => 'xml',
</span><span class="cx" style="display: block; padding: 0 10px"> 'autoCloseBrackets' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'autoCloseTags' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3483,7 +3502,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'text/x-yaml' === $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $settings['codemirror'] = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $settings['codemirror'], array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $settings['codemirror'],
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mode' => 'yaml',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3973,7 +3993,8 @@
</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><span class="cx" style="display: block; padding: 0 10px"> wp_admin_css_color(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'fresh', _x( 'Default', 'admin color scheme' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'fresh',
+ _x( 'Default', 'admin color scheme' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> false,
</span><span class="cx" style="display: block; padding: 0 10px"> array( '#222', '#333', '#0073aa', '#00a0d2' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3989,7 +4010,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"> wp_admin_css_color(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'light', _x( 'Light', 'admin color scheme' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'light',
+ _x( 'Light', 'admin color scheme' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> admin_url( "css/colors/light/colors$suffix.css" ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '#e5e5e5', '#999', '#d64e07', '#04a4cc' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4000,7 +4022,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"> wp_admin_css_color(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blue', _x( 'Blue', 'admin color scheme' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blue',
+ _x( 'Blue', 'admin color scheme' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> admin_url( "css/colors/blue/colors$suffix.css" ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '#096484', '#4796b3', '#52accc', '#74B6CE' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4011,7 +4034,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"> wp_admin_css_color(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'midnight', _x( 'Midnight', 'admin color scheme' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'midnight',
+ _x( 'Midnight', 'admin color scheme' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> admin_url( "css/colors/midnight/colors$suffix.css" ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '#25282b', '#363b3f', '#69a8bb', '#e14d43' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4022,7 +4046,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"> wp_admin_css_color(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'sunrise', _x( 'Sunrise', 'admin color scheme' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'sunrise',
+ _x( 'Sunrise', 'admin color scheme' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> admin_url( "css/colors/sunrise/colors$suffix.css" ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '#b43c38', '#cf4944', '#dd823b', '#ccaf0b' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4033,7 +4058,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"> wp_admin_css_color(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'ectoplasm', _x( 'Ectoplasm', 'admin color scheme' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'ectoplasm',
+ _x( 'Ectoplasm', 'admin color scheme' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> admin_url( "css/colors/ectoplasm/colors$suffix.css" ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '#413256', '#523f6d', '#a3b745', '#d46f15' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4044,7 +4070,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"> wp_admin_css_color(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'ocean', _x( 'Ocean', 'admin color scheme' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'ocean',
+ _x( 'Ocean', 'admin color scheme' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> admin_url( "css/colors/ocean/colors$suffix.css" ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '#627c83', '#738e96', '#9ebaa0', '#aa9d88' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4055,7 +4082,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"> wp_admin_css_color(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'coffee', _x( 'Coffee', 'admin color scheme' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'coffee',
+ _x( 'Coffee', 'admin color scheme' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> admin_url( "css/colors/coffee/colors$suffix.css" ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '#46403c', '#59524c', '#c7a589', '#9ea476' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/kses.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1983,7 +1983,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string[] $attr Array of allowed CSS attributes.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_attr = apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'safe_style_css', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'safe_style_css',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'background',
</span><span class="cx" style="display: block; padding: 0 10px"> 'background-color',
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesl10nphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/l10n.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/l10n.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/l10n.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1123,7 +1123,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_pomo_file_data( $po_file ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $headers = get_file_data(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $po_file, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $po_file,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'POT-Creation-Date' => '"POT-Creation-Date',
</span><span class="cx" style="display: block; padding: 0 10px"> 'PO-Revision-Date' => '"PO-Revision-Date',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Project-Id-Version' => '"Project-Id-Version',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1167,7 +1168,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_dropdown_languages( $args = array() ) {
</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(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'locale',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'locale',
</span><span class="cx" style="display: block; padding: 0 10px"> 'languages' => array(),
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/link-template.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,7 +173,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $cats = get_the_category( $post->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $cats ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $cats = wp_list_sort(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cats, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cats,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'term_id' => '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">@@ -292,7 +293,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => $post->post_type,
</span><span class="cx" style="display: block; padding: 0 10px"> 'p' => $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">+ ),
+ ''
</ins><span class="cx" style="display: 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_link = home_url( $post_link );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -698,7 +700,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'feed' => $feed,
</span><span class="cx" style="display: block; padding: 0 10px"> 'attachment_id' => $post_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), home_url( '/' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ home_url( '/' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'page' == $post->post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -705,7 +708,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'feed' => $feed,
</span><span class="cx" style="display: block; padding: 0 10px"> 'page_id' => $post_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), home_url( '/' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ home_url( '/' )
</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"> $url = add_query_arg(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -712,7 +716,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'feed' => $feed,
</span><span class="cx" style="display: block; padding: 0 10px"> 'p' => $post_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), home_url( '/' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ home_url( '/' )
</ins><span class="cx" style="display: block; 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">@@ -2522,7 +2527,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_the_post_navigation( $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'prev_text' => '%title',
</span><span class="cx" style="display: block; padding: 0 10px"> 'next_text' => '%title',
</span><span class="cx" style="display: block; padding: 0 10px"> 'in_same_term' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2595,7 +2601,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't print empty markup if there's only one page.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $GLOBALS['wp_query']->max_num_pages > 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'prev_text' => __( 'Older posts' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'next_text' => __( 'Newer posts' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'screen_reader_text' => __( 'Posts navigation' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2650,7 +2657,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't print empty markup if there's only one page.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $GLOBALS['wp_query']->max_num_pages > 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mid_size' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'prev_text' => _x( 'Previous', 'previous set of posts' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'next_text' => _x( 'Next', 'next set of posts' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2955,7 +2963,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Are there comments to navigate through?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_comment_pages_count() > 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'prev_text' => __( 'Older comments' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'next_text' => __( 'Newer comments' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'screen_reader_text' => __( 'Comments navigation' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3007,7 +3016,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function get_the_comments_pagination( $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $navigation = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'screen_reader_text' => __( 'Comments navigation' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3965,7 +3975,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_avatar_data( $id_or_email, $args = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'size' => 96,
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => null,
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/load.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> if ( is_rtl() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $dir_attr = ' dir="rtl"';
</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"> <!DOCTYPE html>
</span><span class="cx" style="display: block; padding: 0 10px"> <html xmlns="http://www.w3.org/1999/xhtml"<?php echo $dir_attr; ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <head>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,7 +237,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h1><?php _e( 'Briefly unavailable for scheduled maintenance. Check back in a minute.' ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> </body>
</span><span class="cx" style="display: block; padding: 0 10px"> </html>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> die();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media-template.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/media-template.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> function wp_underscore_audio_template() {
</span><span class="cx" style="display: block; padding: 0 10px"> $audio_types = wp_get_audio_extensions();
</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"> <audio style="visibility: hidden"
</span><span class="cx" style="display: block; padding: 0 10px"> controls
</span><span class="cx" style="display: block; padding: 0 10px"> class="wp-audio-shortcode"
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'autoplay', 'loop' ) as $attr ) :
</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"> if ( ! _.isUndefined( data.model.<?php echo $attr; ?> ) && data.model.<?php echo $attr; ?> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> #> <?php echo $attr; ?><#
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,15 +36,15 @@
</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"> foreach ( $audio_types as $type ) :
</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"> <# if ( ! _.isEmpty( data.model.<?php echo $type; ?> ) ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <source src="{{ data.model.<?php echo $type; ?> }}" type="{{ wp.media.view.settings.embedMimes[ '<?php echo $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">- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> endforeach;
</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"> </audio>
</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
</ins><span class="cx" style="display: block; 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">@@ -55,7 +55,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_underscore_video_template() {
</span><span class="cx" style="display: block; padding: 0 10px"> $video_types = wp_get_video_extensions();
</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"> <# var w_rule = '', classes = [],
</span><span class="cx" style="display: block; padding: 0 10px"> w, h, settings = wp.media.view.settings,
</span><span class="cx" style="display: block; padding: 0 10px"> isYouTube = isVimeo = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,18 +96,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( w ) { #>width="{{ w }}"<# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( h ) { #>height="{{ h }}"<# } #>
</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">- $props = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $props = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'poster' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'preload' => 'metadata',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $props as $key => $value ) :
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $value ) ) {
</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"> <#
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! _.isUndefined( data.model.<?php echo $key; ?> ) && data.model.<?php echo $key; ?> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> #> <?php echo $key; ?>="{{ data.model.<?php echo $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">- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> echo $key
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'autoplay', 'loop' ) as $attr ) :
</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"> if ( ! _.isUndefined( data.model.<?php echo $attr; ?> ) && data.model.<?php echo $attr; ?> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> #> <?php echo $attr; ?><#
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $video_types as $type ) :
</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"> <# if ( data.model.<?php echo $type; ?> ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <source src="{{ data.model.<?php echo $type; ?> }}" type="{{ settings.embedMimes[ '<?php echo $type; ?>' ] }}" />
</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"> {{{ data.model.content }}}
</span><span class="cx" style="display: block; padding: 0 10px"> </video>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; 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">@@ -413,7 +413,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'artist' => __( 'Artist' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'album' => __( 'Album' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) as $key => $label ) :
</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"> <label class="setting" data-setting="<?php echo esc_attr( $key ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="name"><?php echo $label; ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" value="{{ data.<?php echo $key; ?> || data.meta.<?php echo $key; ?> || '' }}" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -596,7 +596,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'artist' => __( 'Artist' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'album' => __( 'Album' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) as $key => $label ) :
</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"> <label class="setting" data-setting="<?php echo esc_attr( $key ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="name"><?php echo $label; ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" value="{{ data.<?php echo $key; ?> || data.meta.<?php echo $key; ?> || '' }}" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -719,7 +719,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/media.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $sizes = apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image_size_names_choose', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image_size_names_choose',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail' => __( 'Thumbnail' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'medium' => __( 'Medium' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'large' => __( 'Large' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -728,7 +729,7 @@
</span><span class="cx" style="display: 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 ( $sizes as $value => $name ) :
</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"> <#
</span><span class="cx" style="display: block; padding: 0 10px"> var size = data.sizes['<?php echo esc_js( $value ); ?>'];
</span><span class="cx" style="display: block; padding: 0 10px"> if ( size ) { #>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -797,7 +798,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/media.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $size_names = apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image_size_names_choose', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image_size_names_choose',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail' => __( 'Thumbnail' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'medium' => __( 'Medium' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'large' => __( 'Large' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -806,7 +808,7 @@
</span><span class="cx" style="display: 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 ( $size_names as $size => $label ) :
</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"> <option value="<?php echo esc_attr( $size ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_html( $label ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </option>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -867,7 +869,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/media.php */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! apply_filters( 'disable_captions', '' ) ) :
</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"> <label class="setting caption">
</span><span class="cx" style="display: block; padding: 0 10px"> <span><?php _e( 'Caption' ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea data-setting="caption" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -933,7 +935,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/media.php */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! apply_filters( 'disable_captions', '' ) ) :
</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"> <label class="setting caption">
</span><span class="cx" style="display: block; padding: 0 10px"> <span><?php _e( 'Caption' ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea data-setting="caption">{{ data.model.caption }}</textarea>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -976,7 +978,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/media.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $sizes = apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image_size_names_choose', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image_size_names_choose',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail' => __( 'Thumbnail' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'medium' => __( 'Medium' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'large' => __( 'Large' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -985,7 +988,7 @@
</span><span class="cx" style="display: 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 ( $sizes as $value => $name ) :
</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"> <#
</span><span class="cx" style="display: block; padding: 0 10px"> var size = data.sizes['<?php echo esc_js( $value ); ?>'];
</span><span class="cx" style="display: block; padding: 0 10px"> if ( size ) { #>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1093,7 +1096,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"> foreach ( $audio_types as $type ) :
</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"> <# if ( ! _.isEmpty( data.model.<?php echo $type; ?> ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! _.isUndefined( html5types.<?php echo $type; ?> ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> delete html5types.<?php echo $type; ?>;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1176,7 +1179,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"> foreach ( $video_types as $type ) :
</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"> <# if ( ! _.isEmpty( data.model.<?php echo $type; ?> ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! _.isUndefined( html5types.<?php echo $type; ?> ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> delete html5types.<?php echo $type; ?>;
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/media.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1552,7 +1552,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'caption' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'class' => '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $attr, 'caption'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $attr,
+ 'caption'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $atts['width'] = (int) $atts['width'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1722,7 +1724,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'include' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'exclude' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'link' => '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $attr, 'gallery'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $attr,
+ 'gallery'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = intval( $atts['id'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1897,7 +1901,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_underscore_playlist_templates() {
</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"> <script type="text/html" id="tmpl-wp-playlist-current-item">
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.image ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <img src="{{ data.thumb.src }}" alt="" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1936,7 +1940,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"> </script>
</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
</ins><span class="cx" style="display: block; 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">@@ -1949,9 +1953,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_playlist_scripts( $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_style( 'wp-mediaelement' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'wp-playlist' );
</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"> <!--[if lt IE 9]><script>document.createElement('<?php echo esc_js( $type ); ?>');</script><![endif]-->
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_footer', 'wp_underscore_playlist_templates', 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_footer', 'wp_underscore_playlist_templates', 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2039,7 +2043,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'tracknumbers' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'images' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'artists' => true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $attr, 'playlist'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $attr,
+ 'playlist'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = intval( $atts['id'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2188,7 +2194,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <<?php echo $safe_type; ?> controls="controls" preload="none" width="
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> echo (int) $theme_width;
</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"> "
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'video' === $safe_type ) :
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3294,7 +3300,8 @@
</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/media.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $possible_sizes = apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image_size_names_choose', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image_size_names_choose',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail' => __( 'Thumbnail' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'medium' => __( 'Medium' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'large' => __( 'Large' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3560,7 +3567,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> FROM $wpdb->posts
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE post_type = %s
</span><span class="cx" style="display: block; padding: 0 10px"> ORDER BY post_date DESC
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ", 'attachment'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ",
+ 'attachment'
</ins><span class="cx" style="display: block; 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">@@ -4126,7 +4134,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $data_to_export = 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">- $user = get_user_by( 'email' , $email_address );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = get_user_by( 'email', $email_address );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false === $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'data' => $data_to_export,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4151,7 +4159,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $attachment_url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data_to_export = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( 'name' => __( 'URL' ), 'value' => $attachment_url ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array(
+ 'name' => __( 'URL' ),
+ 'value' => $attachment_url,
+ ),
</ins><span class="cx" style="display: 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_to_export[] = array(
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/meta.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +77,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $unique && $wpdb->get_var(
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->prepare(
</span><span class="cx" style="display: block; padding: 0 10px"> "SELECT COUNT(*) FROM $table WHERE meta_key = %s AND $column = %d",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta_key, $object_id
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta_key,
+ $object_id
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +102,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( "add_{$meta_type}_meta", $object_id, $meta_key, $_meta_value );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $table, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $table,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> $column => $object_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_key' => $meta_key,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_value' => $meta_value,
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/ms-blogs.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1439,9 +1439,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $value;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = wp_update_site( $blog_id, array(
- $pref => $value,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = wp_update_site(
+ $blog_id,
+ array(
+ $pref => $value,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $result ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/ms-functions.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -498,7 +498,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $limited_email_domains = get_site_option( 'limited_email_domains' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $limited_email_domains = array_map( 'strtolower', $limited_email_domains );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $emaildomain = strtolower( substr( $user_email, 1 + strpos( $user_email, '@' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $emaildomain = strtolower( substr( $user_email, 1 + strpos( $user_email, '@' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $emaildomain, $limited_email_domains, true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'user_email', __( 'Sorry, that email address is not allowed!' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> // If registered more than two days ago, cancel registration and let this signup go through.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $diff > 2 * DAY_IN_SECONDS ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->delete(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->signups, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->signups,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'domain' => $mydomain,
</span><span class="cx" style="display: block; padding: 0 10px"> 'path' => $path,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -767,7 +768,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $meta = apply_filters( 'signup_site_meta', $meta, $domain, $path, $title, $user, $user_email, $key );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->signups, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->signups,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'domain' => $domain,
</span><span class="cx" style="display: block; padding: 0 10px"> 'path' => $path,
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => $title,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -832,7 +834,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $meta = apply_filters( 'signup_user_meta', $meta, $user, $user_email, $key );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->signups, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->signups,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'domain' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'path' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -938,7 +941,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> apply_filters(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wpmu_signup_blog_notification_email',
</span><span class="cx" style="display: block; padding: 0 10px"> __( "To activate your blog, please click the following link:\n\n%1\$s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your site here:\n\n%2\$s" ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $domain, $path, $title, $user_login, $user_email, $key, $meta
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $domain,
+ $path,
+ $title,
+ $user_login,
+ $user_email,
+ $key,
+ $meta
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $activate_url,
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( "http://{$domain}{$path}" ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -964,7 +973,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wpmu_signup_blog_notification_subject',
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: New site notification email subject. 1: Network name, 2: New site URL */
</span><span class="cx" style="display: block; padding: 0 10px"> _x( '[%1$s] Activate %2$s', 'New site notification email subject' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $domain, $path, $title, $user_login, $user_email, $key, $meta
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $domain,
+ $path,
+ $title,
+ $user_login,
+ $user_email,
+ $key,
+ $meta
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $from_name,
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( 'http://' . $domain . $path )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1042,7 +1057,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> apply_filters(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wpmu_signup_user_notification_email',
</span><span class="cx" style="display: block; padding: 0 10px"> __( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login." ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_login, $user_email, $key, $meta
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_login,
+ $user_email,
+ $key,
+ $meta
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> site_url( "wp-activate.php?key=$key" )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1063,7 +1081,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wpmu_signup_user_notification_subject',
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: New user notification email subject. 1: Network name, 2: New user login */
</span><span class="cx" style="display: block; padding: 0 10px"> _x( '[%1$s] Activate %2$s', 'New user notification email subject' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_login, $user_email, $key, $meta
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_login,
+ $user_email,
+ $key,
+ $meta
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $from_name,
</span><span class="cx" style="display: block; padding: 0 10px"> $user_login
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1128,10 +1149,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $signup->domain ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->signups, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->signups,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'active' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'activated' => $now,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), array( 'activation_key' => $key )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array( 'activation_key' => $key )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $user_already_exists ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1164,10 +1187,12 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->signups, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->signups,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'active' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'activated' => $now,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), array( 'activation_key' => $key )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array( 'activation_key' => $key )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $blog_id;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1174,10 +1199,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"> $wpdb->update(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->signups, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->signups,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'active' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'activated' => $now,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), array( 'activation_key' => $key )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array( 'activation_key' => $key )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires immediately after a site is activated.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1385,7 +1412,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> Remote IP address: %3$s
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> Disable these notifications: %4$s'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $blogname, $siteurl, wp_unslash( $_SERVER['REMOTE_ADDR'] ), $options_site_url
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $blogname,
+ $siteurl,
+ wp_unslash( $_SERVER['REMOTE_ADDR'] ),
+ $options_site_url
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the message body of the new site activation email sent
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1433,7 +1464,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> Remote IP address: %2$s
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> Disable these notifications: %3$s'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $user->user_login, wp_unslash( $_SERVER['REMOTE_ADDR'] ), $options_site_url
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $user->user_login,
+ wp_unslash( $_SERVER['REMOTE_ADDR'] ),
+ $options_site_url
</ins><span class="cx" style="display: block; 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">@@ -2001,7 +2035,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( (int) $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->registration_log, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->registration_log,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'email' => $user->user_email,
</span><span class="cx" style="display: block; padding: 0 10px"> 'IP' => preg_replace( '/[^0-9., ]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'blog_id' => $blog_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2050,7 +2085,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $used_global_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM $wpdb->sitecategories WHERE cat_ID = %d", $c->term_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( null == $used_global_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->sitecategories, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->sitecategories,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'cat_ID' => $term_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'cat_name' => $c->name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'category_nicename' => $c->slug,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2065,7 +2101,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $max_local_id = $wpdb->get_var( "SELECT MAX(term_id) FROM $wpdb->terms" );
</span><span class="cx" style="display: block; padding: 0 10px"> $new_global_id = max( $max_global_id, $max_local_id ) + mt_rand( 100, 400 );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->sitecategories, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->sitecategories,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'cat_ID' => $new_global_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'cat_name' => $c->name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'category_nicename' => $c->slug,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2890,9 +2927,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $email_change_email['message'] = str_replace( '###SITEURL###', home_url(), $email_change_email['message'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_mail(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $email_change_email['to'], sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $email_change_email['to'],
+ sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> $email_change_email['subject'],
</span><span class="cx" style="display: block; padding: 0 10px"> $network_name
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $email_change_email['message'], $email_change_email['headers']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $email_change_email['message'],
+ $email_change_email['headers']
</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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/nav-menu-template.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -448,9 +448,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_indexless_current = untrailingslashit( preg_replace( '/' . preg_quote( $wp_rewrite->index, '/' ) . '$/', '', $current_url ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $matches = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_url, urldecode( $current_url ),
- $_indexless_current, urldecode( $_indexless_current ),
- $_root_relative_current, urldecode( $_root_relative_current ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_url,
+ urldecode( $current_url ),
+ $_indexless_current,
+ urldecode( $_indexless_current ),
+ $_root_relative_current,
+ urldecode( $_root_relative_current ),
</ins><span class="cx" style="display: 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 ( $raw_item_url && in_array( $item_url, $matches ) ) {
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/nav-menu.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> if ( ! empty( $terms ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array_keys( $terms ) as $taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px"> get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'include' => $terms[ $taxonomy ],
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -741,7 +742,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ARRAY_A == $args['output'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $items = wp_list_sort(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $items, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $items,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['output_key'] => '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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/option.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1384,7 +1384,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $serialized_value = maybe_serialize( $value );
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->sitemeta, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->sitemeta,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'site_id' => $network_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_key' => $option,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_value' => $serialized_value,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1492,7 +1493,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( $cache_key, 'site-options' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $wpdb->delete(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->sitemeta, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->sitemeta,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'meta_key' => $option,
</span><span class="cx" style="display: block; padding: 0 10px"> 'site_id' => $network_id,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1603,7 +1605,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $serialized_value = maybe_serialize( $value );
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $wpdb->update(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->sitemeta, array( 'meta_value' => $serialized_value ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->sitemeta,
+ array( 'meta_value' => $serialized_value ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'site_id' => $network_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_key' => $option,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1873,7 +1877,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function register_initial_settings() {
</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">- 'general', 'blogname', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'general',
+ 'blogname',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'title',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1883,7 +1889,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"> register_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'general', 'blogdescription', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'general',
+ 'blogdescription',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'description',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1894,7 +1902,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> register_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'general', 'siteurl', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'general',
+ 'siteurl',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'url',
</span><span class="cx" style="display: block; padding: 0 10px"> 'schema' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1909,7 +1919,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> register_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'general', 'admin_email', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'general',
+ 'admin_email',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'email',
</span><span class="cx" style="display: block; padding: 0 10px"> 'schema' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1923,7 +1935,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"> register_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'general', 'timezone_string', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'general',
+ 'timezone_string',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'timezone',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1933,7 +1947,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"> register_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'general', 'date_format', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'general',
+ 'date_format',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'A date format for all date strings.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1941,7 +1957,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"> register_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'general', 'time_format', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'general',
+ 'time_format',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'A time format for all time strings.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1949,7 +1967,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"> register_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'general', 'start_of_week', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'general',
+ 'start_of_week',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'integer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'A day number of the week that the week should start on.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1957,7 +1977,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"> register_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'general', 'WPLANG', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'general',
+ 'WPLANG',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'language',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1968,7 +1990,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"> register_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'writing', 'use_smilies', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'writing',
+ 'use_smilies',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'boolean',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Convert emoticons like :-) and :-P to graphics on display.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1977,7 +2001,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"> register_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'writing', 'default_category', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'writing',
+ 'default_category',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'integer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Default post category.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1985,7 +2011,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"> register_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'writing', 'default_post_format', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'writing',
+ 'default_post_format',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Default post format.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1993,7 +2021,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"> register_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'reading', 'posts_per_page', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'reading',
+ 'posts_per_page',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'integer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Blog pages show at most.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2002,7 +2032,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"> register_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'discussion', 'default_ping_status', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'discussion',
+ 'default_ping_status',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'schema' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'enum' => array( 'open', 'closed' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2014,7 +2046,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"> register_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'discussion', 'default_comment_status', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'discussion',
+ 'default_comment_status',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'schema' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'enum' => array( 'open', 'closed' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2025,11 +2059,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">- register_setting( 'permalink', 'permalink_structure', array(
- 'show_in_rest' => true,
- 'type' => 'string',
- 'description' => __( 'Custom URL structure for permalinks and archives.' ),
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_setting(
+ 'permalink',
+ 'permalink_structure',
+ array(
+ 'show_in_rest' => true,
+ 'type' => 'string',
+ 'description' => __( 'Custom URL structure for permalinks and archives.' ),
+ )
+ );
</ins><span class="cx" style="display: block; 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">@@ -2092,7 +2130,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'misc' == $option_group ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __FUNCTION__, '3.0.0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __FUNCTION__,
+ '3.0.0',
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: misc */
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The "%s" options group has been removed. Use another settings group.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2104,7 +2143,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'privacy' == $option_group ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __FUNCTION__, '3.5.0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __FUNCTION__,
+ '3.5.0',
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: privacy */
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The "%s" options group has been removed. Use another settings group.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2142,7 +2182,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'misc' == $option_group ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __FUNCTION__, '3.0.0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __FUNCTION__,
+ '3.0.0',
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: misc */
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The "%s" options group has been removed. Use another settings group.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2154,7 +2195,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'privacy' == $option_group ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __FUNCTION__, '3.5.0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __FUNCTION__,
+ '3.5.0',
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: privacy */
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The "%s" options group has been removed. Use another settings group.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2170,7 +2212,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $deprecated ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __FUNCTION__, '4.7.0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __FUNCTION__,
+ '4.7.0',
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: $sanitize_callback, 2: register_setting() */
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( '%1$s is deprecated. The callback from %2$s is used instead.' ),
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/pluggable.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1336,7 +1336,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $location The path or URL to redirect to.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $status Optional. HTTP response status code to use. Default '302' (Moved Temporarily).
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $x_redirect_by Optional. The application doing the redirect. Default 'WordPress'.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool $redirect False if the redirect was cancelled, true otherwise.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool $redirect False if the redirect was cancelled, true otherwise.
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1753,8 +1753,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> _n(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Currently %s comment is waiting for approval. Please visit the moderation panel:',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Currently %s comments are waiting for approval. Please visit the moderation panel:', $comments_waiting
- ), number_format_i18n( $comments_waiting )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Currently %s comments are waiting for approval. Please visit the moderation panel:',
+ $comments_waiting
+ ),
+ number_format_i18n( $comments_waiting )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= admin_url( 'edit-comments.php?comment_status=moderated#wpbody-content' ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2489,10 +2491,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $hash = wp_hash_password( $password );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->users, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->users,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_pass' => $hash,
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_activation_key' => '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), array( 'ID' => $user_id )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array( 'ID' => $user_id )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( $user_id, 'users' );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/pomo/mo.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,9 +107,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $hash_addr = $translations_lenghts_addr + 8 * $total;
</span><span class="cx" style="display: block; padding: 0 10px"> $current_addr = $hash_addr;
</span><span class="cx" style="display: block; padding: 0 10px"> fwrite(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $fh, pack(
- 'V*', $magic, $revision, $total, $originals_lenghts_addr,
- $translations_lenghts_addr, $size_of_hash, $hash_addr
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fh,
+ pack(
+ 'V*',
+ $magic,
+ $revision,
+ $total,
+ $originals_lenghts_addr,
+ $translations_lenghts_addr,
+ $size_of_hash,
+ $hash_addr
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</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></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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/post.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function create_initial_post_types() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'labels' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name_admin_bar' => _x( 'Post', 'add new from admin bar' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +42,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"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'page', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'page',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'labels' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name_admin_bar' => _x( 'Page', 'add new from admin bar' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +66,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"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'attachment', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'attachment',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'labels' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => _x( 'Media', 'post type general name' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'name_admin_bar' => _x( 'Media', 'add new from admin bar' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,7 +100,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_type_support( 'attachment:video', 'thumbnail' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'revision', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'revision',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'labels' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => __( 'Revisions' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'singular_name' => __( 'Revision' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +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"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'nav_menu_item', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'nav_menu_item',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'labels' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => __( 'Navigation Menu Items' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'singular_name' => __( 'Navigation Menu Item' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +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"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'custom_css', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'custom_css',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'labels' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => __( 'Custom CSS' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'singular_name' => __( 'Custom CSS' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +169,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"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'customize_changeset', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'customize_changeset',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'labels' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => _x( 'Changesets', 'post type general name' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'singular_name' => _x( 'Changeset', 'post type singular name' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,7 +217,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"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'oembed_cache', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'oembed_cache',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'labels' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => __( 'oEmbed Responses' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'singular_name' => __( 'oEmbed Response' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -227,7 +235,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"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user_request', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_request',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'labels' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => __( 'User Requests' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'singular_name' => __( 'User Request' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,7 +253,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"> register_post_status(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'publish', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'publish',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => _x( 'Published', 'post status' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true, /* internal use only. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,7 +263,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"> register_post_status(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'future', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'future',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => _x( 'Scheduled', 'post status' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'protected' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true, /* internal use only. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,7 +273,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"> register_post_status(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'draft', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'draft',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => _x( 'Draft', 'post status' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'protected' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true, /* internal use only. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,7 +283,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"> register_post_status(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'pending', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'pending',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => _x( 'Pending', 'post status' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'protected' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true, /* internal use only. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,7 +293,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"> register_post_status(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'private', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'private',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => _x( 'Private', 'post status' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'private' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true, /* internal use only. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -289,7 +303,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"> register_post_status(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'trash', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'trash',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => _x( 'Trash', 'post status' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'internal' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true, /* internal use only. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,7 +314,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"> register_post_status(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'auto-draft', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'auto-draft',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => 'auto-draft',
</span><span class="cx" style="display: block; padding: 0 10px"> 'internal' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true, /* internal use only. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,7 +323,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"> register_post_status(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'inherit', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'inherit',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => 'inherit',
</span><span class="cx" style="display: block; padding: 0 10px"> 'internal' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true, /* internal use only. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -316,7 +333,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"> register_post_status(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'request-pending', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'request-pending',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => _x( 'Pending', 'request status' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'internal' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true, /* internal use only. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -325,7 +343,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"> register_post_status(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'request-confirmed', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'request-confirmed',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => _x( 'Confirmed', 'request status' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'internal' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true, /* internal use only. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,7 +353,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"> register_post_status(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'request-failed', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'request-failed',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => _x( 'Failed', 'request status' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'internal' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true, /* internal use only. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,7 +363,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"> register_post_status(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'request-completed', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'request-completed',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => _x( 'Completed', 'request status' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'internal' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true, /* internal use only. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4701,7 +4722,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> FROM $wpdb->posts
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE post_title = %s
</span><span class="cx" style="display: block; padding: 0 10px"> AND post_type IN ($post_type_in_string)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ", $page_title
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ",
+ $page_title
</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"> $sql = $wpdb->prepare(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4710,7 +4732,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> FROM $wpdb->posts
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE post_title = %s
</span><span class="cx" style="display: block; padding: 0 10px"> AND post_type = %s
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ", $page_title, $post_type
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ",
+ $page_title,
+ $post_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">@@ -5902,7 +5926,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_check_for_changed_dates( $post_id, $post, $post_before ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $previous_date = date( 'Y-m-d', strtotime( $post_before->post_date ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $new_date = date( 'Y-m-d', strtotime( $post->post_date ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new_date = date( 'Y-m-d', strtotime( $post->post_date ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> // Don't bother if it hasn't changed.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $new_date == $previous_date ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span></span></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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/query.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1037,13 +1037,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // if year, monthnum, or day have been specified, make our query more precise
</span><span class="cx" style="display: block; padding: 0 10px"> // just in case there are multiple identical _wp_old_slug values
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_query_var( 'year' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query .= $wpdb->prepare( " AND YEAR(post_date) = %d", get_query_var( 'year' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query .= $wpdb->prepare( ' AND YEAR(post_date) = %d', get_query_var( 'year' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_query_var( 'monthnum' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query .= $wpdb->prepare( " AND MONTH(post_date) = %d", get_query_var( 'monthnum' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query .= $wpdb->prepare( ' AND MONTH(post_date) = %d', get_query_var( 'monthnum' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_query_var( 'day' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query .= $wpdb->prepare( " AND DAYOFMONTH(post_date) = %d", get_query_var( 'day' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query .= $wpdb->prepare( ' AND DAYOFMONTH(post_date) = %d', get_query_var( 'day' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = (int) $wpdb->get_var( $query );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1069,13 +1069,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $date_query = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_query_var( 'year' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $date_query .= $wpdb->prepare( " AND YEAR(pm_date.meta_value) = %d", get_query_var( 'year' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $date_query .= $wpdb->prepare( ' AND YEAR(pm_date.meta_value) = %d', get_query_var( 'year' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_query_var( 'monthnum' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $date_query .= $wpdb->prepare( " AND MONTH(pm_date.meta_value) = %d", get_query_var( 'monthnum' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $date_query .= $wpdb->prepare( ' AND MONTH(pm_date.meta_value) = %d', get_query_var( 'monthnum' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_query_var( 'day' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $date_query .= $wpdb->prepare( " AND DAYOFMONTH(pm_date.meta_value) = %d", get_query_var( 'day' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $date_query .= $wpdb->prepare( ' AND DAYOFMONTH(pm_date.meta_value) = %d', get_query_var( 'day' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = 0;
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/rest-api/class-wp-rest-request.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -802,7 +802,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $invalid_params ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'rest_invalid_param', sprintf( __( 'Invalid parameter(s): %s' ), implode( ', ', array_keys( $invalid_params ) ) ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'rest_invalid_param',
+ sprintf( __( 'Invalid parameter(s): %s' ), implode( ', ', array_keys( $invalid_params ) ) ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'status' => 400,
</span><span class="cx" style="display: block; padding: 0 10px"> 'params' => $invalid_params,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -845,7 +847,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $required ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'rest_missing_callback_param', sprintf( __( 'Missing parameter(s): %s' ), implode( ', ', $required ) ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'rest_missing_callback_param',
+ sprintf( __( 'Missing parameter(s): %s' ), implode( ', ', $required ) ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'status' => 400,
</span><span class="cx" style="display: block; padding: 0 10px"> 'params' => $required,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -878,7 +882,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $invalid_params ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'rest_invalid_param', sprintf( __( 'Invalid parameter(s): %s' ), implode( ', ', array_keys( $invalid_params ) ) ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'rest_invalid_param',
+ sprintf( __( 'Invalid parameter(s): %s' ), implode( ', ', array_keys( $invalid_params ) ) ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'status' => 400,
</span><span class="cx" style="display: block; padding: 0 10px"> 'params' => $invalid_params,
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/rest-api/class-wp-rest-server.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,7 +265,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $rest_enabled Whether the REST API is enabled. Default true.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> apply_filters_deprecated(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'rest_enabled', array( true ), '4.7.0', 'rest_authentication_errors',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'rest_enabled',
+ array( true ),
+ '4.7.0',
+ 'rest_authentication_errors',
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The REST API can no longer be completely disabled, the rest_authentication_errors filter can be used to restrict access to the API, instead.' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -656,7 +659,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->namespaces[ $namespace ] = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->register_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $namespace, '/' . $namespace, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $namespace,
+ '/' . $namespace,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => self::READABLE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => array( $this, 'get_namespace_index' ),
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function register_routes() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->namespace, '/' . $this->rest_base, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->namespace,
+ '/' . $this->rest_base,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => WP_REST_Server::READABLE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => array( $this, 'get_items' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +64,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"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->namespace,
+ '/' . $this->rest_base . '/(?P<id>[\d]+)',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Unique identifier for the object.' ),
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -586,7 +586,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Only use required / default from arg_options on CREATABLE endpoints.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( WP_REST_Server::CREATABLE !== $method ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $params['arg_options'] = array_diff_key(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $params['arg_options'], array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $params['arg_options'],
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'required' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => '',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +36,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function register_routes() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->namespace, '/' . $this->rest_base, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->namespace,
+ '/' . $this->rest_base,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => WP_REST_Server::READABLE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => array( $this, 'get_items' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +50,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"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->namespace, '/' . $this->rest_base . '/(?P<status>[\w-]+)', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->namespace,
+ '/' . $this->rest_base . '/(?P<status>[\w-]+)',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'status' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'An alphanumeric identifier for the status.' ),
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +36,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function register_routes() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->namespace, '/' . $this->rest_base, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->namespace,
+ '/' . $this->rest_base,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => WP_REST_Server::READABLE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => array( $this, 'get_items' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +50,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"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->namespace, '/' . $this->rest_base . '/(?P<type>[\w-]+)', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->namespace,
+ '/' . $this->rest_base . '/(?P<type>[\w-]+)',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'An alphanumeric identifier for the post type.' ),
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +58,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function register_routes() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->namespace, '/' . $this->rest_base, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->namespace,
+ '/' . $this->rest_base,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => WP_REST_Server::READABLE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => array( $this, 'get_items' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,7 +88,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"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->namespace,
+ '/' . $this->rest_base . '/(?P<id>[\d]+)',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Unique identifier for the object.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1691,7 +1695,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $last_revision,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: 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_obj = get_post_type_object( $post->post_type );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +66,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function register_routes() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->namespace, '/' . $this->parent_base . '/(?P<parent>[\d]+)/' . $this->rest_base, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->namespace,
+ '/' . $this->parent_base . '/(?P<parent>[\d]+)/' . $this->rest_base,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'The ID for the parent of the object.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,7 +86,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"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->namespace, '/' . $this->parent_base . '/(?P<parent>[\d]+)/' . $this->rest_base . '/(?P<id>[\d]+)', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->namespace,
+ '/' . $this->parent_base . '/(?P<parent>[\d]+)/' . $this->rest_base . '/(?P<id>[\d]+)',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'The ID for the parent of the object.' ),
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +36,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function register_routes() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->namespace, '/' . $this->rest_base, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->namespace,
+ '/' . $this->rest_base,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => WP_REST_Server::READABLE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => array( $this, 'get_item' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,7 +189,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( rest_validate_value_from_schema( get_option( $args['option_name'], false ), $args['schema'] ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'rest_invalid_stored_value', sprintf( __( 'The %s property has an invalid stored value, and cannot be updated to null.' ), $name ), array( 'status' => 500 )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'rest_invalid_stored_value',
+ sprintf( __( 'The %s property has an invalid stored value, and cannot be updated to null.' ), $name ),
+ 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></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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +36,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function register_routes() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->namespace, '/' . $this->rest_base, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->namespace,
+ '/' . $this->rest_base,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => WP_REST_Server::READABLE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => array( $this, 'get_items' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +50,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"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->namespace, '/' . $this->rest_base . '/(?P<taxonomy>[\w-]+)', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->namespace,
+ '/' . $this->rest_base . '/(?P<taxonomy>[\w-]+)',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'An alphanumeric identifier for the taxonomy.' ),
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +74,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function register_routes() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->namespace, '/' . $this->rest_base, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->namespace,
+ '/' . $this->rest_base,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => WP_REST_Server::READABLE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => array( $this, 'get_items' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +94,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"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->namespace,
+ '/' . $this->rest_base . '/(?P<id>[\d]+)',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Unique identifier for the term.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -422,7 +426,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $term_id = $term->get_error_data( 'term_exists' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $existing_term = get_term( $term_id, $this->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> $term->add_data( $existing_term->term_id, 'term_exists' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term->add_data( array( 'status' => 400, 'term_id' => $term_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term->add_data(
+ array(
+ 'status' => 400,
+ 'term_id' => $term_id,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $term;
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function register_routes() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->namespace, '/' . $this->rest_base, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->namespace,
+ '/' . $this->rest_base,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => WP_REST_Server::READABLE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => array( $this, 'get_items' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +66,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"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->namespace,
+ '/' . $this->rest_base . '/(?P<id>[\d]+)',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Unique identifier for the user.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +112,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->namespace, '/' . $this->rest_base . '/me', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->namespace,
+ '/' . $this->rest_base . '/me',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => WP_REST_Server::READABLE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => array( $this, 'get_current_item' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,7 +200,7 @@
</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="cx" style="display: block; padding: 0 10px"> $can_view = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $types = get_post_types( array( 'show_in_rest' => true ), 'objects' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $types = get_post_types( array( 'show_in_rest' => true ), 'objects' );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $types as $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( post_type_supports( $type->name, 'author' )
</span><span class="cx" style="display: block; padding: 0 10px"> && current_user_can( $type->cap->edit_posts ) ) {
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function register_field() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_field(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->get_rest_field_type(), 'meta', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->get_rest_field_type(),
+ 'meta',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'get_callback' => array( $this, 'get_value' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'update_callback' => array( $this, 'update_value' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'schema' => $this->get_field_schema(),
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/revision.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -474,7 +474,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $post->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'revision',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'inherit',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/script-loader.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +69,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'utils', "/wp-includes/js/utils$suffix.js" );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'utils', 'userSettings', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'utils',
+ 'userSettings',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'url' => (string) SITECOOKIEPATH,
</span><span class="cx" style="display: block; padding: 0 10px"> 'uid' => (string) get_current_user_id(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'time' => (string) time(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,7 +81,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array( 'jquery', 'hoverIntent', 'utils' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'common', 'commonL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'common',
+ 'commonL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'warnDelete' => __( "You are about to permanently delete these items from your site.\nThis action cannot be undone.\n 'Cancel' to stop, 'OK' to delete." ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'dismiss' => __( 'Dismiss this notice.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'collapseMenu' => __( 'Collapse Main menu' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +97,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", array(), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'quicktags', 'quicktagsL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'quicktags',
+ 'quicktagsL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'closeAllOpenTags' => __( 'Close all open tags' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'closeTags' => __( 'close tags' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'enterURL' => __( 'Enter the URL' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +141,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'wp-ajax-response', "/wp-includes/js/wp-ajax-response$suffix.js", array( 'jquery' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp-ajax-response', 'wpAjax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp-ajax-response',
+ 'wpAjax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'noPerm' => __( 'Sorry, you are not allowed to do that.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'broken' => __( 'Something went wrong.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +152,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'wp-api-request', "/wp-includes/js/api-request$suffix.js", array( 'jquery' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> // `wpApiSettings` is also used by `wp-api`, which depends on this script.
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp-api-request', 'wpApiSettings', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp-api-request',
+ 'wpApiSettings',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'root' => esc_url_raw( get_rest_url() ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'nonce' => ( wp_installing() && ! is_multisite() ) ? '' : wp_create_nonce( 'wp_rest' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'versionString' => 'wp/v2/',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,7 +163,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'wp-pointer', "/wp-includes/js/wp-pointer$suffix.js", array( 'jquery-ui-widget', 'jquery-ui-position' ), '20111129a', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp-pointer', 'wpPointerL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp-pointer',
+ 'wpPointerL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'dismiss' => __( 'Dismiss' ),
</span><span class="cx" style="display: block; padding: 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 +174,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'heartbeat', "/wp-includes/js/heartbeat$suffix.js", array( 'jquery' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'heartbeat', 'heartbeatSettings',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'heartbeat',
+ 'heartbeatSettings',
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the Heartbeat settings.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,7 +188,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'wp-auth-check', "/wp-includes/js/wp-auth-check$suffix.js", array( 'heartbeat' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp-auth-check', 'authcheckL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp-auth-check',
+ 'authcheckL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'beforeunload' => __( 'Your session has expired. You can log in again from this page or go to the login 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">@@ -254,7 +269,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Strings for 'jquery-ui-autocomplete' live region messages
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'jquery-ui-autocomplete', 'uiAutocompleteL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'jquery-ui-autocomplete',
+ 'uiAutocompleteL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'noResults' => __( 'No results found.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Number of results found when using jQuery UI Autocomplete */
</span><span class="cx" style="display: block; padding: 0 10px"> 'oneResult' => __( '1 result found. Use up and down arrow keys to navigate.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,7 +304,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.js', array( 'jquery' ), '3.1-20121105', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'thickbox', 'thickboxL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'thickbox',
+ 'thickboxL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'next' => __( 'Next >' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'prev' => __( '< Prev' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'image' => __( 'Image' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -358,7 +377,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'wp-util', "/wp-includes/js/wp-util$suffix.js", array( 'underscore', 'jquery' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp-util', '_wpUtilSettings', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp-util',
+ '_wpUtilSettings',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'ajax' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => admin_url( 'admin-ajax.php', 'relative' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -378,8 +399,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'mediaelement-migrate', "/wp-includes/js/mediaelement/mediaelement-migrate$suffix.js", array(), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->add_inline_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mediaelement-core', sprintf(
- 'var mejsL10n = %s;', wp_json_encode(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mediaelement-core',
+ sprintf(
+ 'var mejsL10n = %s;',
+ wp_json_encode(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'language' => strtolower( strtok( is_admin() ? get_user_locale() : get_locale(), '_-' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'strings' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -467,7 +490,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">- ), 'before'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'before'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'mediaelement-vimeo', '/wp-includes/js/mediaelement/renderers/vimeo.min.js', array( 'mediaelement' ), '4.2.6-78496d1', 1 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -478,7 +502,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'stretching' => 'responsive',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mediaelement', '_wpmejsSettings',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mediaelement',
+ '_wpmejsSettings',
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the MediaElement configuration settings.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -499,8 +524,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'code-editor', "/wp-admin/js/code-editor$suffix.js", array( 'jquery', 'wp-codemirror', 'underscore' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'wp-theme-plugin-editor', "/wp-admin/js/theme-plugin-editor$suffix.js", array( 'wp-util', 'wp-sanitize', 'jquery', 'jquery-ui-core', 'wp-a11y', 'underscore' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->add_inline_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp-theme-plugin-editor', sprintf(
- 'wp.themePluginEditor.l10n = %s;', wp_json_encode(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp-theme-plugin-editor',
+ sprintf(
+ 'wp.themePluginEditor.l10n = %s;',
+ wp_json_encode(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'saveError' => __( 'Something went wrong. Your change may not have been saved. Please try again. There is also a chance that you may need to manually fix and upload the file over FTP.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -519,7 +546,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'zxcvbn-async', "/wp-includes/js/zxcvbn-async$suffix.js", array(), '1.0' );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'zxcvbn-async', '_zxcvbnSettings', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'zxcvbn-async',
+ '_zxcvbnSettings',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'src' => empty( $guessed_url ) ? includes_url( '/js/zxcvbn.min.js' ) : $scripts->base_url . '/wp-includes/js/zxcvbn.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">@@ -526,7 +555,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array( 'jquery', 'zxcvbn-async' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'password-strength-meter', 'pwsL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'password-strength-meter',
+ 'pwsL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'unknown' => _x( 'Password strength unknown', 'password strength' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'short' => _x( 'Very weak', 'password strength' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'bad' => _x( 'Weak', 'password strength' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -538,7 +569,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter', 'wp-util' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user-profile', 'userProfileL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user-profile',
+ 'userProfileL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'warn' => __( 'Your new password has not been saved.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'warnWeak' => __( 'Confirm use of weak password' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'show' => __( 'Show' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -557,7 +590,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'wplink', "/wp-includes/js/wplink$suffix.js", array( 'jquery', 'wp-a11y' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wplink', 'wpLinkL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wplink',
+ 'wpLinkL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Insert/edit link' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'update' => __( 'Update' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'save' => __( 'Add Link' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -583,7 +618,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'customize-views', '/wp-includes/js/customize-views.js', array( 'jquery', 'underscore', 'imgareaselect', 'customize-models', 'media-editor', 'media-views' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'customize-controls', "/wp-admin/js/customize-controls$suffix.js", array( 'customize-base', 'wp-a11y', 'wp-util', 'jquery-ui-core' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'customize-controls', '_wpCustomizeControlsL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'customize-controls',
+ '_wpCustomizeControlsL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'activate' => __( 'Activate & Publish' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'save' => __( 'Save & Publish' ), // @todo Remove as not required.
</span><span class="cx" style="display: block; padding: 0 10px"> 'publish' => __( 'Publish' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -662,7 +699,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'shortcode', "/wp-includes/js/shortcode$suffix.js", array( 'underscore' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'media-models', "/wp-includes/js/media-models$suffix.js", array( 'wp-backbone' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'media-models', '_wpMediaModelsL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'media-models',
+ '_wpMediaModelsL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ajaxurl' => admin_url( 'admin-ajax.php', 'relative' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'post' => array( 'id' => 0 ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -684,7 +723,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array( 'jquery', 'wp-ajax-response' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'admin-tags', 'tagsl10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'admin-tags',
+ 'tagsl10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'noPerm' => __( 'Sorry, you are not allowed to do that.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'broken' => __( 'Something went wrong.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -692,7 +733,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array( 'wp-lists', 'quicktags', 'jquery-query' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'admin-comments', 'adminCommentsL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'admin-comments',
+ 'adminCommentsL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hotkeys_highlight_first' => isset( $_GET['hotkeys_highlight_first'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'hotkeys_highlight_last' => isset( $_GET['hotkeys_highlight_last'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'replyApprove' => __( 'Approve and Reply' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -707,7 +750,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'xfn', "/wp-admin/js/xfn$suffix.js", array( 'jquery' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'xfn', 'privacyToolsL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'xfn',
+ 'privacyToolsL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'noDataFound' => __( 'No personal data was found for this user.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'foundAndRemoved' => __( 'All of the personal data found for this user was erased.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'noneRemoved' => __( 'Personal data was found for this user but was not erased.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -720,7 +765,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array( 'jquery-ui-sortable' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'postbox', 'postBoxL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'postbox',
+ 'postBoxL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'postBoxEmptyString' => __( 'Drag boxes here' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -729,7 +776,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'tags-suggest', "/wp-admin/js/tags-suggest$suffix.js", array( 'jquery-ui-autocomplete', 'wp-a11y' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'tags-suggest', 'tagsSuggestL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'tags-suggest',
+ 'tagsSuggestL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'tagDelimiter' => _x( ',', 'tag delimiter' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'removeTerm' => __( 'Remove term:' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'termSelected' => __( 'Term selected.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -751,7 +800,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array( 'suggest', 'wp-lists', 'postbox', 'tags-box', 'underscore', 'word-count', 'wp-a11y' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post', 'postL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post',
+ 'postL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'ok' => __( 'OK' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'cancel' => __( 'Cancel' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'publishOn' => __( 'Publish on:' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -785,7 +836,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'comment', "/wp-admin/js/comment$suffix.js", array( 'jquery', 'postbox' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add_data( 'comment', 'group', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'comment', 'commentL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'comment',
+ 'commentL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'submittedOn' => __( 'Submitted on:' ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute */
</span><span class="cx" style="display: block; padding: 0 10px"> 'dateFormat' => __( '%1$s %2$s, %3$s @ %4$s:%5$s' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -796,8 +849,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'admin-widgets', "/wp-admin/js/widgets$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable', 'wp-a11y' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->add_inline_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'admin-widgets', sprintf(
- 'wpWidgets.l10n = %s;', wp_json_encode(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'admin-widgets',
+ sprintf(
+ 'wpWidgets.l10n = %s;',
+ wp_json_encode(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'save' => __( 'Save' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'saved' => __( 'Saved' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -822,7 +877,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'tags-suggest', 'wp-a11y' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'inline-edit-post', 'inlineEditL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'inline-edit-post',
+ 'inlineEditL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'error' => __( 'Error while saving the changes.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'ntdeltitle' => __( 'Remove From Bulk Edit' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'notitle' => __( '(no title)' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -833,7 +890,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery', 'wp-a11y' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'inline-edit-tax', 'inlineEditL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'inline-edit-tax',
+ 'inlineEditL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'error' => __( 'Error while saving the changes.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'saved' => __( 'Changes saved.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -841,7 +900,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery', 'jquery-ui-core', 'thickbox' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'plugin-install', 'plugininstallL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'plugin-install',
+ 'plugininstallL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'plugin_information' => __( 'Plugin:' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin_modal_label' => __( 'Plugin details' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'ays' => __( 'Are you sure you want to install this plugin?' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -850,7 +911,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'updates', "/wp-admin/js/updates$suffix.js", array( 'jquery', 'wp-util', 'wp-a11y' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'updates', '_wpUpdatesSettings', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'updates',
+ '_wpUpdatesSettings',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'ajax_nonce' => wp_create_nonce( 'updates' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'l10n' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Search string */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -941,7 +1004,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'iris', '/wp-admin/js/iris.min.js', array( 'jquery-ui-draggable', 'jquery-ui-slider', 'jquery-touch-punch' ), '1.0.7', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'wp-color-picker', "/wp-admin/js/color-picker$suffix.js", array( 'iris' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp-color-picker', 'wpColorPickerL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp-color-picker',
+ 'wpColorPickerL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'clear' => __( 'Clear' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'clearAriaLabel' => __( 'Clear color' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'defaultString' => __( 'Default' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -958,7 +1023,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'media-grid', "/wp-includes/js/media-grid$suffix.js", array( 'media-editor' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'media', "/wp-admin/js/media$suffix.js", array( 'jquery' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'media', 'attachMediaBoxL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'media',
+ 'attachMediaBoxL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'error' => __( 'An error has occurred. Please reload the page and try again.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -965,7 +1032,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'image-edit', "/wp-admin/js/image-edit$suffix.js", array( 'jquery', 'json2', 'imgareaselect' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image-edit', 'imageEditL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image-edit',
+ 'imageEditL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'error' => __( 'Could not load the preview image. Please reload the page and try again.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -972,7 +1041,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'set-post-thumbnail', "/wp-admin/js/set-post-thumbnail$suffix.js", array( 'jquery' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'set-post-thumbnail', 'setPostThumbnailL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'set-post-thumbnail',
+ 'setPostThumbnailL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'setThumbnail' => __( 'Use as featured image' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'saving' => __( 'Saving...' ), // no ellipsis
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -983,7 +1054,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Navigation Menus
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable', 'wp-lists', 'postbox', 'json2' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'nav-menu', 'navMenuL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'nav-menu',
+ 'navMenuL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'noResultsFound' => __( 'No results found.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'warnDeleteMenu' => __( "You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete." ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1204,7 +1277,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_just_in_time_script_localization() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'autosave', 'autosaveL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'autosave',
+ 'autosaveL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'autosaveInterval' => AUTOSAVE_INTERVAL,
</span><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"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1211,13 +1286,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"> wp_localize_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mce-view', 'mceViewL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mce-view',
+ 'mceViewL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'shortcodes' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array(),
</span><span class="cx" style="display: block; 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"> wp_localize_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'word-count', 'wordCountL10n', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'word-count',
+ 'wordCountL10n',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * translators: If your word count is based on single characters (e.g. East Asian characters),
</span><span class="cx" style="display: block; padding: 0 10px"> * enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1326,7 +1405,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $events_client = new WP_Community_Events( $user_id, $saved_location );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'dashboard', 'communityEventsData', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'dashboard',
+ 'communityEventsData',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'nonce' => wp_create_nonce( 'community_events' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'cache' => $events_client->get_cached_events(),
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/taxonomy.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +58,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"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'category', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'category',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'query_var' => 'category_name',
</span><span class="cx" style="display: block; padding: 0 10px"> 'rewrite' => $rewrite['category'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,7 +81,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"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_tag', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_tag',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'query_var' => 'tag',
</span><span class="cx" style="display: block; padding: 0 10px"> 'rewrite' => $rewrite['post_tag'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +104,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"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'nav_menu', 'nav_menu_item', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'nav_menu',
+ 'nav_menu_item',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'labels' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +122,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"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'link_category', 'link', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'link_category',
+ 'link',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'labels' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => __( 'Link Categories' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,7 +156,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"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_format', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_format',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'labels' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1867,7 +1877,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $object_ids as $object_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $object_id, $taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $object_id,
+ $taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'none',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2200,7 +2212,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term_group = $wpdb->get_var( "SELECT MAX(term_group) FROM $wpdb->terms" ) + 1;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $alias->term_id, $taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $alias->term_id,
+ $taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'term_group' => $term_group,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2212,7 +2226,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * unless a unique slug has been explicitly provided.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $name_matches = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => $name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $args['parent'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2239,7 +2254,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $slug_provided || $name_match->slug === $slug || $slug_match ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_taxonomy_hierarchical( $taxonomy ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $siblings = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'get' => 'all',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $parent,
</span><span class="cx" style="display: block; padding: 0 10px"> 'update_term_meta_cache' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2450,7 +2466,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $append ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $old_tt_ids = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $object_id, $taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $object_id,
+ $taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'tt_ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'none',
</span><span class="cx" style="display: block; padding: 0 10px"> 'update_term_meta_cache' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2499,7 +2517,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'add_term_relationship', $object_id, $tt_id, $taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->term_relationships, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->term_relationships,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'object_id' => $object_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'term_taxonomy_id' => $tt_id,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2890,7 +2909,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term_group = $wpdb->get_var( "SELECT MAX(term_group) FROM $wpdb->terms" ) + 1;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $alias->term_id, $taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $alias->term_id,
+ $taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'term_group' => $term_group,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3402,7 +3423,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"> $terms = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ids, $taxonomies, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ids,
+ $taxonomies,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'all_with_object_id',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'name',
</span><span class="cx" style="display: block; padding: 0 10px"> 'update_term_meta_cache' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3476,7 +3499,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $children = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'get' => 'all',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'id',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'id=>parent',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4326,7 +4350,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: taxonomy label, %l: list of terms formatted as per $term_template */
</span><span class="cx" style="display: block; padding: 0 10px"> 'template' => __( '%s: %l.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'term_template' => '<a href="%1$s">%2$s</a>',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/theme-compat/comments.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: number of comments, 2: post title */
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> _n( '%1$s response to %2$s', '%1$s responses to %2$s', get_comments_number() ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- number_format_i18n( get_comments_number() ), '“' . get_the_title() . '”'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ number_format_i18n( get_comments_number() ),
+ '“' . get_the_title() . '”'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span></span></pre></div>
<a id="trunksrcwpincludesthemecompatembedcontentphp"></a>
<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/embed-content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme-compat/embed-content.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/theme-compat/embed-content.php 2018-08-17 01:50:26 UTC (rev 43571)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $thumbnail_id && 'rectangular' === $shape ) :
</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"> <div class="wp-embed-featured-image rectangular">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php the_permalink(); ?>" target="_top">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo wp_get_attachment_image( $thumbnail_id, $image_size ); ?>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/theme-compat/header.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,10 +29,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( file_exists( get_stylesheet_directory() . '/images/kubrickbgwide.jpg' ) ) { ?>
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-// Checks to see whether it needs a sidebar
-if ( empty( $withcomments ) && ! is_single() ) {
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ // Checks to see whether it needs a sidebar
+ if ( empty( $withcomments ) && ! is_single() ) {
+ ?>
</ins><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><span class="cx" style="display: block; padding: 0 10px"> <?php } else { // No sidebar ?>
</span><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></pre></div>
<a id="trunksrcwpincludesthemecompatsidebarphp"></a>
<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/sidebar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme-compat/sidebar.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/theme-compat/sidebar.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* Widgetized sidebar, if you have the plugin installed. */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'dynamic_sidebar' ) || ! dynamic_sidebar() ) :
</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"> <li>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php get_search_form(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,13 +31,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </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
- if ( is_404() || is_category() || is_day() || is_month() ||
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( is_404() || is_category() || is_day() || is_month() ||
</ins><span class="cx" style="display: block; padding: 0 10px"> is_year() || is_search() || is_paged() ) :
</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"> <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 if ( is_404() ) : /* If this is a 404 page */ ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( is_404() ) : /* If this is a 404 page */ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( is_category() ) : /* If this is a category archive */ ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,10 +111,10 @@
</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"> </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php endif; ?>
</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"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul role="navigation">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php wp_list_pages( 'title_li=<h2>' . __( 'Pages' ) . '</h2>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_list_pages( 'title_li=<h2>' . __( 'Pages' ) . '</h2>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li><h2><?php _e( 'Archives' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,18 +122,18 @@
</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
- wp_list_categories(
- array(
- 'show_count' => 1,
- 'title_li' => '<h2>' . __( 'Categories' ) . '</h2>',
- )
- );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ wp_list_categories(
+ array(
+ 'show_count' => 1,
+ 'title_li' => '<h2>' . __( 'Categories' ) . '</h2>',
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( is_home() || is_page() ) { /* If this is the frontpage */ ?>
- <?php wp_list_bookmarks(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( is_home() || is_page() ) { /* If this is the frontpage */ ?>
+ <?php wp_list_bookmarks(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li><h2><?php _e( 'Meta' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/theme.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -725,7 +725,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $_sidebars_widgets ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> set_theme_mod(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'sidebars_widgets', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'sidebars_widgets',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'time' => time(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'data' => $_sidebars_widgets,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1677,11 +1678,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $style .= $image . $position . $size . $repeat . $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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <style type="text/css" id="custom-background-css">
</span><span class="cx" style="display: block; padding: 0 10px"> body.custom-background { <?php echo trim( $style ); ?> }
</span><span class="cx" style="display: block; padding: 0 10px"> </style>
</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
</ins><span class="cx" style="display: block; 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">@@ -1692,11 +1693,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_custom_css_cb() {
</span><span class="cx" style="display: block; padding: 0 10px"> $styles = wp_get_custom_css();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $styles || is_customize_preview() ) :
</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"> <style type="text/css" id="wp-custom-css">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo strip_tags( $styles ); // Note that esc_html() cannot be used because `div > span` is not interpreted properly. ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </style>
</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
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1802,7 +1803,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_update_custom_css_post( $css, $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'preprocessed' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> '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">@@ -2021,7 +2023,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => _x( 'Find Us', 'Theme starter content' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'text' => join(
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> '<strong>' . _x( 'Address', 'Theme starter content' ) . "</strong>\n",
</span><span class="cx" style="display: block; padding: 0 10px"> _x( '123 Main Street', 'Theme starter content' ) . "\n" . _x( 'New York, NY 10001', 'Theme starter content' ) . "\n\n",
</span><span class="cx" style="display: block; padding: 0 10px"> '<strong>' . _x( 'Hours', 'Theme starter content' ) . "</strong>\n",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2539,10 +2542,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( did_action( 'wp_loaded' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: title-tag, 2: wp_loaded */
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "add_theme_support( 'title-tag' )", sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "add_theme_support( 'title-tag' )",
+ sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Theme support for %1$s should be registered before the %2$s hook.' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<code>title-tag</code>', '<code>wp_loaded</code>'
- ), '4.1.0'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<code>title-tag</code>',
+ '<code>wp_loaded</code>'
+ ),
+ '4.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"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2613,7 +2619,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"> </style>
</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
</ins><span class="cx" style="display: block; 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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/update.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +189,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"> $offer = (object) array_intersect_key(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $offer, array_fill_keys(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $offer,
+ array_fill_keys(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'response',
</span><span class="cx" style="display: block; padding: 0 10px"> 'download',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,7 +205,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'notify_email',
</span><span class="cx" style="display: block; padding: 0 10px"> 'support_email',
</span><span class="cx" style="display: block; padding: 0 10px"> 'new_files',
</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"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/user.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -909,7 +909,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> FROM {$wpdb->usermeta}
</span><span class="cx" style="display: block; padding: 0 10px"> INNER JOIN {$wpdb->users} ON user_id = ID
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE meta_key = '{$blog_prefix}capabilities'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ", ARRAY_N
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ",
+ ARRAY_N
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Run the previous loop again to associate results with role names.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2606,7 +2607,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> FROM $wpdb->usermeta
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE meta_key = '{$prefix}capabilities'
</span><span class="cx" style="display: block; padding: 0 10px"> AND meta_value NOT REGEXP %s
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ", $regex
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ",
+ $regex
</ins><span class="cx" style="display: block; 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">@@ -2707,7 +2709,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $current_user->user_email != $_POST['email'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_email( $_POST['email'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user_email', __( '<strong>ERROR</strong>: The email address isn’t correct.' ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_email',
+ __( '<strong>ERROR</strong>: The email address isn’t correct.' ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'form-field' => 'email',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2717,7 +2721,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_email FROM {$wpdb->users} WHERE user_email=%s", $_POST['email'] ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user_email', __( '<strong>ERROR</strong>: The email address is already used.' ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_email',
+ __( '<strong>ERROR</strong>: The email address is already used.' ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'form-field' => 'email',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2940,10 +2946,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"> update_post_meta( $request_id, '_wp_user_request_confirmed_timestamp', time() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_update_post( array(
- 'ID' => $request_id,
- 'post_status' => 'request-confirmed',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_post(
+ array(
+ 'ID' => $request_id,
+ 'post_status' => 'request-confirmed',
+ )
+ );
</ins><span class="cx" style="display: block; 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">@@ -3126,7 +3134,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'siteurl' => home_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">- $subject = sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $subject = sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Site name. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( '[%s] Erasure Request Fulfilled' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $email_data['sitename']
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3235,15 +3243,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_privacy_account_request_confirmed_message( $request_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $request = wp_get_user_request_data( $request_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">- $message = '<p class="success">' . __( 'Action has been confirmed.' ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = '<p class="success">' . __( 'Action has been confirmed.' ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $message .= '<p>' . __( 'The site administrator has been notified and will fulfill your request as soon as possible.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $request && in_array( $request->action_name, _wp_privacy_action_request_types(), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'export_personal_data' === $request->action_name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message = '<p class="success">' . __( 'Thanks for confirming your export request.' ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = '<p class="success">' . __( 'Thanks for confirming your export request.' ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $message .= '<p>' . __( 'The site administrator has been notified. You will receive a link to download your export via email when they fulfill your request.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'remove_personal_data' === $request->action_name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message = '<p class="success">' . __( 'Thanks for confirming your erasure request.' ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = '<p class="success">' . __( 'Thanks for confirming your erasure request.' ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $message .= '<p>' . __( 'The site administrator has been notified. You will receive an email confirmation when they erase your data.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3290,28 +3298,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = $user && ! is_wp_error( $user ) ? $user->ID : 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check for duplicates.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $requests_query = new WP_Query( array(
- 'post_type' => 'user_request',
- 'post_name__in' => array( $action_name ), // Action name stored in post_name column.
- 'title' => $email_address, // Email address stored in post_title column.
- 'post_status' => 'any',
- 'fields' => 'ids',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $requests_query = new WP_Query(
+ array(
+ 'post_type' => 'user_request',
+ 'post_name__in' => array( $action_name ), // Action name stored in post_name column.
+ 'title' => $email_address, // Email address stored in post_title column.
+ 'post_status' => 'any',
+ 'fields' => 'ids',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $requests_query->found_posts ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'duplicate_request', __( 'A request for this email address already 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">- $request_id = wp_insert_post( array(
- 'post_author' => $user_id,
- 'post_name' => $action_name,
- 'post_title' => $email_address,
- 'post_content' => wp_json_encode( $request_data ),
- 'post_status' => 'request-pending',
- 'post_type' => 'user_request',
- 'post_date' => current_time( 'mysql', false ),
- 'post_date_gmt' => current_time( 'mysql', true ),
- ), true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request_id = wp_insert_post(
+ array(
+ 'post_author' => $user_id,
+ 'post_name' => $action_name,
+ 'post_title' => $email_address,
+ 'post_content' => wp_json_encode( $request_data ),
+ 'post_status' => 'request-pending',
+ 'post_type' => 'user_request',
+ 'post_date' => current_time( 'mysql', false ),
+ 'post_date_gmt' => current_time( 'mysql', true ),
+ ),
+ true
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $request_id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3380,11 +3393,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'request' => $request,
</span><span class="cx" style="display: block; padding: 0 10px"> 'email' => $request->email,
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => wp_user_request_action_description( $request->action_name ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'confirm_url' => add_query_arg( array(
- 'action' => 'confirmaction',
- 'request_id' => $request_id,
- 'confirm_key' => wp_generate_user_request_key( $request_id ),
- ), wp_login_url() ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'confirm_url' => add_query_arg(
+ array(
+ 'action' => 'confirmaction',
+ 'request_id' => $request_id,
+ 'confirm_key' => wp_generate_user_request_key( $request_id ),
+ ),
+ wp_login_url()
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'sitename' => wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'siteurl' => home_url(),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3496,13 +3512,15 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_update_post( array(
- 'ID' => $request_id,
- 'post_status' => 'request-pending',
- 'post_password' => $wp_hasher->HashPassword( $key ),
- 'post_modified' => current_time( 'mysql', false ),
- 'post_modified_gmt' => current_time( 'mysql', true ),
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_post(
+ array(
+ 'ID' => $request_id,
+ 'post_status' => 'request-pending',
+ 'post_password' => $wp_hasher->HashPassword( $key ),
+ 'post_modified' => current_time( 'mysql', false ),
+ 'post_modified_gmt' => current_time( 'mysql', true ),
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $key;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetarchivesphp"></a>
<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-archives.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-archives.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/widgets/class-wp-widget-archives.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,11 +72,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $instance Settings for the current Archives widget instance.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $dropdown_args = apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'widget_archives_dropdown_args', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'widget_archives_dropdown_args',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'monthly',
</span><span class="cx" style="display: block; padding: 0 10px"> 'format' => 'option',
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_post_count' => $c,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $dropdown_args['type'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,29 +106,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } else { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- /**
- * Filters the arguments for the Archives widget.
- *
- * @since 2.8.0
- * @since 4.9.0 Added the `$instance` parameter.
- *
- * @see wp_get_archives()
- *
- * @param array $args An array of Archives option arguments.
- * @param array $instance Array of settings for the current widget.
- */
- wp_get_archives(
- apply_filters(
- 'widget_archives_args', array(
- 'type' => 'monthly',
- 'show_post_count' => $c,
- ), $instance
- )
- );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Filters the arguments for the Archives widget.
+ *
+ * @since 2.8.0
+ * @since 4.9.0 Added the `$instance` parameter.
+ *
+ * @see wp_get_archives()
+ *
+ * @param array $args An array of Archives option arguments.
+ * @param array $instance Array of settings for the current widget.
+ */
+ wp_get_archives(
+ apply_filters(
+ 'widget_archives_args',
+ array(
+ 'type' => 'monthly',
+ 'show_post_count' => $c,
+ ),
+ $instance
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: 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 $args['after_widget'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,7 +149,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function update( $new_instance, $old_instance ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = $old_instance;
</span><span class="cx" style="display: block; padding: 0 10px"> $new_instance = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- (array) $new_instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ (array) $new_instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'count' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'dropdown' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,7 +172,8 @@
</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"> $instance = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- (array) $instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ (array) $instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'count' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'dropdown' => '',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/widgets/class-wp-widget-categories.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,26 +105,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* ]]> */
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
- $cat_args['title_li'] = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $cat_args['title_li'] = '';
</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 for the Categories widget.
- *
- * @since 2.8.0
- * @since 4.9.0 Added the `$instance` parameter.
- *
- * @param array $cat_args An array of Categories widget options.
- * @param array $instance Array of settings for the current widget.
- */
- wp_list_categories( apply_filters( 'widget_categories_args', $cat_args, $instance ) );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Filters the arguments for the Categories widget.
+ *
+ * @since 2.8.0
+ * @since 4.9.0 Added the `$instance` parameter.
+ *
+ * @param array $cat_args An array of Categories widget options.
+ * @param array $instance Array of settings for the current widget.
+ */
+ wp_list_categories( apply_filters( 'widget_categories_args', $cat_args, $instance ) );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: 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 $args['after_widget'];
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/widgets/class-wp-widget-custom-html.php 2018-08-17 01:50:26 UTC (rev 43571)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prepare instance data that looks like a normal Text widget.
</span><span class="cx" style="display: block; padding: 0 10px"> $simulated_text_widget_instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'text' => isset( $instance['content'] ) ? $instance['content'] : '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'filter' => false, // Because wpautop is not applied.
</span><span class="cx" style="display: block; padding: 0 10px"> 'visual' => false, // Because it wasn't created in TinyMCE.
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/widgets/class-wp-widget-links.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,7 +126,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //Defaults
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- (array) $instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ (array) $instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'images' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,7 +141,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $limit = intval( $instance['limit'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $limit = -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">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="<?php echo $this->get_field_id( 'category' ); ?>"><?php _e( 'Select Link Category:' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <select class="widefat" id="<?php echo $this->get_field_id( 'category' ); ?>" name="<?php echo $this->get_field_name( 'category' ); ?>">
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetmediaaudiophp"></a>
<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-audio.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-audio.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/widgets/class-wp-widget-media-audio.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,9 @@
</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"> parent::__construct(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'media_audio', __( 'Audio' ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'media_audio',
+ __( 'Audio' ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Displays an audio player.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'mime_type' => 'audio',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +32,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"> $this->l10n = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->l10n, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->l10n,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'no_media_selected' => __( 'No audio selected' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'add_media' => _x( 'Add Audio', 'label for button in the audio widget' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'replace_media' => _x( 'Replace Audio', 'label for button in the audio widget; should preferably not be longer than ~13 characters long' ),
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetmediagalleryphp"></a>
<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-gallery.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-gallery.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/widgets/class-wp-widget-media-gallery.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,9 @@
</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"> parent::__construct(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'media_gallery', __( 'Gallery' ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'media_gallery',
+ __( 'Gallery' ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Displays an image gallery.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'mime_type' => 'image',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +32,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"> $this->l10n = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->l10n, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->l10n,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'no_media_selected' => __( 'No images selected' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'add_media' => _x( 'Add Images', 'label for button in the gallery widget; should not be longer than ~13 characters long' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'replace_media' => '',
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetmediaimagephp"></a>
<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-image.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-image.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/widgets/class-wp-widget-media-image.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,9 @@
</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"> parent::__construct(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'media_image', __( 'Image' ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'media_image',
+ __( 'Image' ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Displays an image.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'mime_type' => 'image',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +32,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"> $this->l10n = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->l10n, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->l10n,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'no_media_selected' => __( 'No image selected' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'add_media' => _x( 'Add Image', 'label for button in the image widget' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'replace_media' => _x( 'Replace Image', 'label for button in the image widget; should preferably not be longer than ~13 characters long' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,7 +176,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function render_media( $instance ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array_merge( wp_list_pluck( $this->get_instance_schema(), 'default' ), $instance );
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'size' => 'thumbnail',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,7 +274,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => $width,
</span><span class="cx" style="display: block; padding: 0 10px"> 'caption' => $caption,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $image
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $image
</ins><span class="cx" style="display: block; 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="trunksrcwpincludeswidgetsclasswpwidgetmediavideophp"></a>
<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-video.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-video.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/widgets/class-wp-widget-media-video.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,9 @@
</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"> parent::__construct(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'media_video', __( 'Video' ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'media_video',
+ __( 'Video' ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Displays a video from the media library or from YouTube, Vimeo, or another provider.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'mime_type' => 'video',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +32,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"> $this->l10n = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->l10n, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->l10n,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'no_media_selected' => __( 'No video selected' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'add_media' => _x( 'Add Video', 'label for button in the video widget' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'replace_media' => _x( 'Replace Video', 'label for button in the video widget; should preferably not be longer than ~13 characters long' ),
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/widgets/class-wp-widget-media.php 2018-08-17 01:50:26 UTC (rev 43571)
</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 __construct( $id_base, $name, $widget_options = array(), $control_options = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $widget_opts = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $widget_options, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $widget_options,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'A media item.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'customize_selective_refresh' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'mime_type' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +81,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'media_library_state_single' => __( 'Media Widget' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'unsupported_file_type' => __( 'Looks like this isn’t the correct kind of file. Please link to an appropriate file 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">- $this->l10n = array_merge( $l10n_defaults, array_filter( $this->l10n ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->l10n = array_merge( $l10n_defaults, array_filter( $this->l10n ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> parent::__construct(
</span><span class="cx" style="display: block; padding: 0 10px"> $id_base,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -338,7 +339,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> id="<?php echo esc_attr( $this->get_field_id( $name ) ); // Needed specifically by wpWidgets.appendTitle(). ?>"
</span><span class="cx" style="display: block; padding: 0 10px"> value="<?php echo esc_attr( is_array( $value ) ? join( ',', $value ) : strval( $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">- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> endforeach;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetmetaphp"></a>
<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-meta.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-meta.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/widgets/class-wp-widget-meta.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $title ) {
</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><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"> <ul>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_register(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><?php wp_loginout(); ?></li>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,12 +69,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $instance Array of settings for the current widget.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> echo apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'widget_meta_poweredby', sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'widget_meta_poweredby',
+ sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> '<li><a href="%s" title="%s">%s</a></li>',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( __( 'https://wordpress.org/' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr__( 'Powered by WordPress, state-of-the-art semantic personal publishing platform.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> _x( 'WordPress.org', 'meta widget link text' )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: 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_meta();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,8 +114,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function form( $instance ) {
</span><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"> $title = sanitize_text_field( $instance['title'] );
</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"> <p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ); ?></label> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></p>
</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
</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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/widgets/class-wp-widget-pages.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,12 +73,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_list_pages(
</span><span class="cx" style="display: block; padding: 0 10px"> apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'widget_pages_args', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'widget_pages_args',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title_li' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'sort_column' => $sortby,
</span><span class="cx" style="display: block; padding: 0 10px"> 'exclude' => $exclude,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; 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">@@ -87,11 +89,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $title ) {
</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><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"> <ul>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $out; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> echo $args['after_widget'];
</span><span class="cx" style="display: block; padding: 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,7 +132,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function form( $instance ) {
</span><span class="cx" style="display: block; padding: 0 10px"> //Defaults
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- (array) $instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ (array) $instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'sortby' => 'post_title',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'exclude' => '',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/widgets/class-wp-widget-recent-comments.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,11 +97,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $comments = get_comments(
</span><span class="cx" style="display: block; padding: 0 10px"> apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'widget_comments_args', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'widget_comments_args',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'number' => $number,
</span><span class="cx" style="display: block; padding: 0 10px"> 'status' => 'approve',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; 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="trunksrcwpincludeswidgetsclasswpwidgetrecentpostsphp"></a>
<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-posts.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-posts.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/widgets/class-wp-widget-recent-posts.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,12 +69,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $r = new WP_Query(
</span><span class="cx" style="display: block; padding: 0 10px"> apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'widget_posts_args', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'widget_posts_args',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'posts_per_page' => $number,
</span><span class="cx" style="display: block; padding: 0 10px"> 'no_found_rows' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'ignore_sticky_posts' => true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; 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,7 +137,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $title = isset( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $number = isset( $instance['number'] ) ? absint( $instance['number'] ) : 5;
</span><span class="cx" style="display: block; padding: 0 10px"> $show_date = isset( $instance['show_date'] ) ? (bool) $instance['show_date'] : false;
</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"> <p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" /></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,6 +146,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><input class="checkbox" type="checkbox"<?php checked( $show_date ); ?> id="<?php echo $this->get_field_id( 'show_date' ); ?>" name="<?php echo $this->get_field_name( 'show_date' ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="<?php echo $this->get_field_id( 'show_date' ); ?>"><?php _e( 'Display post date?' ); ?></label></p>
</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
</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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/widgets/class-wp-widget-tag-cloud.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,11 +68,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $tag_cloud = wp_tag_cloud(
</span><span class="cx" style="display: block; padding: 0 10px"> apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'widget_tag_cloud_args', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'widget_tag_cloud_args',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $current_taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_count' => $show_count,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; 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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/widgets/class-wp-widget-text.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -358,7 +358,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function update( $new_instance, $old_instance ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $new_instance = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $new_instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new_instance,
+ array(
</ins><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.
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/widgets.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -681,7 +681,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $params = array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sidebar, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sidebar,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'widget_id' => $id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'widget_name' => $wp_registered_widgets[ $id ]['name'],
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1573,7 +1574,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $esc_number = esc_attr( $args['number'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $inputs['url'] ) :
</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"> <p><label for="rss-url-<?php echo $esc_number; ?>"><?php _e( 'Enter the RSS feed URL here:' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input class="widefat" id="rss-url-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][url]" type="text" value="<?php echo esc_url( $args['url'] ); ?>" /></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; if ( $inputs['title'] ) : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1597,14 +1598,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; if ( $inputs['show_date'] ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><input id="rss-show-date-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][show_date]" type="checkbox" value="1" <?php checked( $args['show_date'] ); ?>/>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="rss-show-date-<?php echo $esc_number; ?>"><?php _e( 'Display item date?' ); ?></label></p>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array_keys( $default_inputs ) as $input ) :
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'hidden' === $inputs[ $input ] ) :
</span><span class="cx" style="display: block; padding: 0 10px"> $id = str_replace( '_', '-', $input );
</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"> <input type="hidden" id="rss-<?php echo esc_attr( $id ); ?>-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][<?php echo esc_attr( $input ); ?>]" value="<?php echo esc_attr( $args[ $input ] ); ?>" />
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px"> endforeach;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludeswpdbphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/wp-db.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/wp-db.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-includes/wp-db.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3217,7 +3217,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> . '|REPLACE(?:\s+LOW_PRIORITY|\s+DELAYED)?(?:\s+INTO)?'
</span><span class="cx" style="display: block; padding: 0 10px"> . '|UPDATE(?:\s+LOW_PRIORITY)?(?:\s+IGNORE)?'
</span><span class="cx" style="display: block; padding: 0 10px"> . '|DELETE(?:\s+LOW_PRIORITY|\s+QUICK|\s+IGNORE)*(?:.+?FROM)?'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- . ')\s+((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)/is', $query, $maybe
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ . ')\s+((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)/is',
+ $query,
+ $maybe
</ins><span class="cx" style="display: block; padding: 0 10px"> ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return str_replace( '`', '', $maybe[1] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3252,7 +3254,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> . '|LOAD\s+DATA.*INFILE.*INTO\s+TABLE'
</span><span class="cx" style="display: block; padding: 0 10px"> . '|(?:GRANT|REVOKE).*ON\s+TABLE'
</span><span class="cx" style="display: block; padding: 0 10px"> . '|SHOW\s+(?:.*FROM|.*TABLE)'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- . ')\s+\(*\s*((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)\s*\)*/is', $query, $maybe
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ . ')\s+\(*\s*((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)\s*\)*/is',
+ $query,
+ $maybe
</ins><span class="cx" style="display: block; padding: 0 10px"> ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return str_replace( '`', '', $maybe[1] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwplinksopmlphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-links-opml.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-links-opml.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-links-opml.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,31 +72,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $catname = apply_filters( 'link_category', $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">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <outline type="category" title="<?php echo esc_attr( $catname ); ?>">
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> $bookmarks = get_bookmarks( array( 'category' => $cat->term_id ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-foreach ( (array) $bookmarks as $bookmark ) :
- /**
- * Filters the OPML outline link title text.
- *
- * @since 2.2.0
- *
- * @param string $title The OPML outline title text.
- */
- $title = apply_filters( 'link_title', $bookmark->link_name );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $bookmarks as $bookmark ) :
+ /**
+ * Filters the OPML outline link title text.
+ *
+ * @since 2.2.0
+ *
+ * @param string $title The OPML outline title text.
+ */
+ $title = apply_filters( 'link_title', $bookmark->link_name );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <outline text="<?php echo esc_attr( $title ); ?>" type="link" xmlUrl="<?php echo esc_attr( $bookmark->link_rss ); ?>" htmlUrl="<?php echo esc_attr( $bookmark->link_url ); ?>" updated="
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '0000-00-00 00:00:00' != $bookmark->link_updated ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo $bookmark->link_updated;}
</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"> " />
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> endforeach; // $bookmarks
</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"> </outline>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> endforeach; // $cats
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </body>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-login.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,14 +254,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't allow interim logins to navigate away from the page.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $interim_login ) :
</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"> <p id="backtoblog"><a href="<?php echo esc_url( home_url( '/' ) ); ?>">
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: site title */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( _x( '← Back to %s', 'site' ), get_bloginfo( 'title', 'display' ) );
</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"> </a></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php the_privacy_policy_link( '<div class="privacy-policy-page-link">', '</div>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php the_privacy_policy_link( '<div class="privacy-policy-page-link">', '</div>' ); ?>
</ins><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"> </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -291,7 +291,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 wp_shake_js() {
</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"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
</span><span class="cx" style="display: block; padding: 0 10px"> function s(id,pos){g(id).left=pos+'px';}
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,7 +299,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function shake(id,a,d){c=a.shift();s(id,c);if(a.length>0){setTimeout(function(){shake(id,a,d);},d);}else{try{g(id).position='static';wp_attempt_focus();}catch(e){}}}
</span><span class="cx" style="display: block; padding: 0 10px"> addLoadEvent(function(){ var p=new Array(15,30,15,0,-15,-30,-15,0);p=p.concat(p.concat(p));var i=document.forms[0].id;g(i).position='relative';shake(i,p,20);});
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</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
</ins><span class="cx" style="display: block; 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">@@ -603,7 +603,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user_login = wp_unslash( $_POST['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">- ?>
</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"> <form name="lostpasswordform" id="lostpasswordform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=lostpassword', 'login_post' ) ); ?>" method="post">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -610,14 +610,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="user_login" ><?php _e( 'Username or Email Address' ); ?><br />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" autocapitalize="off" /></label>
</span><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
- /**
- * Fires inside the lostpassword form tags, before the hidden fields.
- *
- * @since 2.1.0
- */
- do_action( 'lostpassword_form' );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Fires inside the lostpassword form tags, before the hidden fields.
+ *
+ * @since 2.1.0
+ */
+ do_action( 'lostpassword_form' );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e( 'Get New Password' ); ?>" /></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -624,24 +624,24 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p id="nav">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- if ( get_option( 'users_can_register' ) ) :
- $registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( get_option( 'users_can_register' ) ) :
+ $registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo esc_html( $login_link_separator );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo esc_html( $login_link_separator );
</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 filter is documented in wp-includes/general-template.php */
- echo apply_filters( 'register', $registration_url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** This filter is documented in wp-includes/general-template.php */
+ echo apply_filters( 'register', $registration_url );
</ins><span class="cx" style="display: block; padding: 0 10px"> endif;
</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"> </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">- <?php
- login_footer( 'user_login' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ login_footer( 'user_login' );
</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 ( $switched_locale ) {
- restore_previous_locale();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $switched_locale ) {
+ restore_previous_locale();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -705,7 +705,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> login_header( __( 'Reset Password' ), '<p class="message reset-pass">' . __( 'Enter your new password below.' ) . '</p>', $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">- ?>
</del><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="resetpassform" id="resetpassform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=resetpass', 'login_post' ) ); ?>" method="post" autocomplete="off">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" id="user_login" value="<?php echo esc_attr( $rp_login ); ?>" autocomplete="off" />
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -739,16 +739,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="description indicator-hint"><?php echo wp_get_password_hint(); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <br class="clear" />
</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
- /**
- * Fires following the 'Strength indicator' meter in the user password reset form.
- *
- * @since 3.9.0
- *
- * @param WP_User $user User object of the user whose password is being reset.
- */
- do_action( 'resetpass_form', $user );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Fires following the 'Strength indicator' meter in the user password reset form.
+ *
+ * @since 3.9.0
+ *
+ * @param WP_User $user User object of the user whose password is being reset.
+ */
+ do_action( 'resetpass_form', $user );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="rp_key" value="<?php echo esc_attr( $rp_key ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e( 'Reset Password' ); ?>" /></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -755,24 +755,24 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p id="nav">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- if ( get_option( 'users_can_register' ) ) :
- $registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( get_option( 'users_can_register' ) ) :
+ $registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo esc_html( $login_link_separator );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo esc_html( $login_link_separator );
</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 filter is documented in wp-includes/general-template.php */
- echo apply_filters( 'register', $registration_url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** This filter is documented in wp-includes/general-template.php */
+ echo apply_filters( 'register', $registration_url );
</ins><span class="cx" style="display: block; padding: 0 10px"> endif;
</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"> </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">- <?php
- login_footer( 'user_pass' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ login_footer( 'user_pass' );
</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 ( $switched_locale ) {
- restore_previous_locale();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $switched_locale ) {
+ restore_previous_locale();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -824,7 +824,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_to = apply_filters( 'registration_redirect', $registration_redirect );
</span><span class="cx" style="display: block; padding: 0 10px"> login_header( __( 'Registration Form' ), '<p class="message register">' . __( 'Register For This Site' ) . '</p>', $errors );
</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"> <form name="registerform" id="registerform" action="<?php echo esc_url( site_url( 'wp-login.php?action=register', 'login_post' ) ); ?>" method="post" novalidate="novalidate">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="user_login"><?php _e( 'Username' ); ?><br />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -834,14 +834,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="user_email"><?php _e( 'Email' ); ?><br />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="email" name="user_email" id="user_email" class="input" value="<?php echo esc_attr( wp_unslash( $user_email ) ); ?>" size="25" /></label>
</span><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
- /**
- * Fires following the 'Email' field in the user registration form.
- *
- * @since 2.1.0
- */
- do_action( 'register_form' );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Fires following the 'Email' field in the user registration form.
+ *
+ * @since 2.1.0
+ */
+ do_action( 'register_form' );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p id="reg_passmail"><?php _e( 'Registration confirmation will be emailed to you.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <br class="clear" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -850,20 +850,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p id="nav">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo esc_html( $login_link_separator ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo esc_html( $login_link_separator ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> </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">- <?php
- login_footer( 'user_login' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ login_footer( 'user_login' );
</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 ( $switched_locale ) {
- restore_previous_locale();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $switched_locale ) {
+ restore_previous_locale();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'confirmaction' :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'confirmaction':
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $_GET['request_id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Invalid request.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -943,9 +943,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( headers_sent() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Browser cookie documentation URL, 2: Support forums URL */
</span><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_Error(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test_cookie', sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test_cookie',
+ sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '<strong>ERROR</strong>: Cookies are blocked due to unexpected output. For help, please see <a href="%1$s">this documentation</a> or try the <a href="%2$s">support forums</a>.' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'https://codex.wordpress.org/Cookies' ), __( 'https://wordpress.org/support/' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'https://codex.wordpress.org/Cookies' ),
+ __( 'https://wordpress.org/support/' )
</ins><span class="cx" style="display: 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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -952,7 +954,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If cookies are disabled we can't log in even with a valid user+pass
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Browser cookie documentation URL */
</span><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_Error(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test_cookie', sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test_cookie',
+ sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://codex.wordpress.org/Cookies' )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -977,18 +980,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $message = '<p class="message">' . __( 'You have logged in successfully.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $interim_login = 'success';
</span><span class="cx" style="display: block; padding: 0 10px"> login_header( '', $message );
</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"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-login.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'login_footer' );
</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"> <?php if ( $customize_login ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">setTimeout( function(){ new wp.customize.Messenger({ url: '<?php echo wp_customize_url(); ?>', channel: 'login' }).send('login') }, 1000 );</script>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </body></html>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- exit;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ exit;
</ins><span class="cx" style="display: 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( $redirect_to ) || $redirect_to == 'wp-admin/' || $redirect_to == admin_url() ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1062,7 +1065,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $aria_describedby_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">- ?>
</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"> <form name="loginform" id="loginform" action="<?php echo esc_url( site_url( 'wp-login.php', 'login_post' ) ); ?>" method="post">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1073,23 +1076,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="user_pass"><?php _e( 'Password' ); ?><br />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="password" name="pwd" id="user_pass"<?php echo $aria_describedby_error; ?> class="input" value="" size="20" /></label>
</span><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
- /**
- * Fires following the 'Password' field in the login form.
- *
- * @since 2.1.0
- */
- do_action( 'login_form' );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Fires following the 'Password' field in the login form.
+ *
+ * @since 2.1.0
+ */
+ do_action( 'login_form' );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="forgetmenot"><label for="rememberme"><input name="rememberme" type="checkbox" id="rememberme" value="forever" <?php checked( $rememberme ); ?> /> <?php esc_html_e( 'Remember Me' ); ?></label></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="submit">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e( 'Log In' ); ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $interim_login ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $interim_login ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="interim-login" value="1" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } else { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
</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">- <?php if ( $customize_login ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $customize_login ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="customize-login" value="1" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="testcookie" value="1" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1096,21 +1099,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </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">- <?php if ( ! $interim_login ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! $interim_login ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p id="nav">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- if ( ! isset( $_GET['checkemail'] ) || ! in_array( $_GET['checkemail'], array( 'confirm', 'newpass' ) ) ) :
- if ( get_option( 'users_can_register' ) ) :
- $registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( ! isset( $_GET['checkemail'] ) || ! in_array( $_GET['checkemail'], array( 'confirm', 'newpass' ) ) ) :
+ if ( get_option( 'users_can_register' ) ) :
+ $registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
</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 filter is documented in wp-includes/general-template.php */
- echo apply_filters( 'register', $registration_url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** This filter is documented in wp-includes/general-template.php */
+ echo apply_filters( 'register', $registration_url );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo esc_html( $login_link_separator );
- endif;
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo esc_html( $login_link_separator );
+ endif;
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php endif; ?>
</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"> </p>
</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">@@ -1117,7 +1120,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_attempt_focus(){
</span><span class="cx" style="display: block; padding: 0 10px"> setTimeout( function(){ try{
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $user_login ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $user_login ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> d = document.getElementById('user_pass');
</span><span class="cx" style="display: block; padding: 0 10px"> d.value = '';
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } else { ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1125,7 +1128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( 'invalid_username' == $errors->get_error_code() ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> if( d.value != '' )
</span><span class="cx" style="display: block; padding: 0 10px"> d.value = '';
</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
</ins><span class="cx" style="display: block; 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">@@ -1135,20 +1138,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }, 200);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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
- /**
- * Filters whether to print the call to `wp_attempt_focus()` on the login screen.
- *
- * @since 4.8.0
- *
- * @param bool $print Whether to print the function call. Default true.
- */
- if ( apply_filters( 'enable_login_autofocus', true ) && ! $error ) {
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Filters whether to print the call to `wp_attempt_focus()` on the login screen.
+ *
+ * @since 4.8.0
+ *
+ * @param bool $print Whether to print the function call. Default true.
+ */
+ if ( apply_filters( 'enable_login_autofocus', true ) && ! $error ) {
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_attempt_focus();
</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 } ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> if(typeof wpOnload=='function')wpOnload();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $interim_login ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $interim_login ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> (function(){
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><span class="cx" style="display: block; padding: 0 10px"> var i, links = document.getElementsByTagName('a');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1161,12 +1164,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</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
- login_footer();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ login_footer();
</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 ( $switched_locale ) {
- restore_previous_locale();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $switched_locale ) {
+ restore_previous_locale();
+ }
</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"> } // end action switch
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/wp-signup.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,9 +111,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $errmsg = $errors->get_error_message( 'blogname' ) ) {
</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"> <p class="error"><?php echo $errmsg; ?></p>
</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
</ins><span class="cx" style="display: 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_subdomain_install() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,10 +138,10 @@
</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 if ( $errmsg = $errors->get_error_message( 'blog_title' ) ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="error"><?php echo $errmsg; ?></p>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<input name="blog_title" type="text" id="blog_title" value="' . esc_attr( $blog_title ) . '" />';
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // Site Language.
</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"> </p>
</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
</ins><span class="cx" style="display: block; padding: 0 10px"> endif; // Languages.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_public_on_checked = $blog_public_off_checked = '';
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $blogs = get_blogs_of_user( $current_user->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $blogs ) ) {
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Sites you are already a member of:' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul>
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/src/xmlrpc.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,8 +56,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </apis>
</span><span class="cx" style="display: block; padding: 0 10px"> </service>
</span><span class="cx" style="display: block; padding: 0 10px"> </rsd>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-exit;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ exit;
</ins><span class="cx" style="display: 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_once( ABSPATH . 'wp-admin/includes/admin.php' );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-attachment.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'file' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => 0,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $args
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $args
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return wp_insert_attachment( $r, $r['file'], $r['post_parent'] );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/includes/testcase-rest-post-type-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,7 +217,8 @@
</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 class="cx" style="display: block; padding: 0 10px"> $attributes = array_diff_key(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'href' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -284,7 +285,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> protected function set_raw_post_data( $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, $this->set_post_data(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ $this->set_post_data(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'raw' => 'Post Title',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/includes/utils.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,7 +206,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'XML error: %s at line %d',
</span><span class="cx" style="display: block; padding: 0 10px"> xml_error_string( xml_get_error_code( $this->xml ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> xml_get_current_line_number( $this->xml )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), E_USER_ERROR
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ E_USER_ERROR
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> xml_parser_free( $this->xml );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsadminincludesFilephp"></a>
<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/includesFile.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesFile.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/admin/includesFile.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,19 +40,25 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $error = download_url( 'test_download_url_non_200' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertWPError( $error );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array(
- 'code' => 418,
- 'body' => 'This is an unexpected error message from your favorite server.',
- ), $error->get_error_data() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals(
+ array(
+ 'code' => 418,
+ 'body' => 'This is an unexpected error message from your favorite server.',
+ ),
+ $error->get_error_data()
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'download_url_error_max_body_size', array( $this, '__return_5' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $error = download_url( 'test_download_url_non_200' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertWPError( $error );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array(
- 'code' => 418,
- 'body' => 'This ',
- ), $error->get_error_data() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals(
+ array(
+ 'code' => 418,
+ 'body' => 'This ',
+ ),
+ $error->get_error_data()
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'download_url_error_max_body_size', array( $this, '__return_5' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'pre_http_request', array( $this, '_fake_download_url_non_200_response_code' ) );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/admin/includesListTable.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +81,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'paged' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'posts_per_page' => 2,
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$top[1]->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> self::$children[1][1]->ID,
</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,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'paged' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'posts_per_page' => 2,
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$top[1]->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> self::$children[1][2]->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> self::$children[1][3]->ID,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,7 +115,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'paged' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'posts_per_page' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 's' => 'Child',
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$children[1][1]->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> self::$children[1][2]->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,7 +132,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'paged' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'posts_per_page' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 's' => 'Top',
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$top[3]->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> self::$top[4]->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,7 +149,8 @@
</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="cx" style="display: block; padding: 0 10px"> 'posts_per_page' => 2,
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$top[3]->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> self::$children[3][1]->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> self::$grandchildren[3][1][1]->ID,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +168,8 @@
</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 class="cx" style="display: block; padding: 0 10px"> 'posts_per_page' => 2,
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$top[3]->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> self::$children[3][1]->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> self::$grandchildren[3][1][3]->ID,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,7 +193,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $args
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $args
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Mimic the behaviour of `wp_edit_posts_query()`:
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/admin/includesPost.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -389,7 +389,9 @@
</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><span class="cx" style="display: block; padding: 0 10px"> $p = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'صورة.jpg', 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'صورة.jpg',
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'صورة',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/admin/includesScreen.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,7 +262,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $screen = get_current_screen();
</span><span class="cx" style="display: block; padding: 0 10px"> $screen->add_help_tab( $tab_args );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $screen->get_help_tab( $tab ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $screen->get_help_tab( $tab ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => $tab,
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'Help!',
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' => 'Some content',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,7 +353,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tab_1 => $tab_1_args,
</span><span class="cx" style="display: block; padding: 0 10px"> $tab_4 => $tab_4_args,
</span><span class="cx" style="display: block; padding: 0 10px"> $tab_3 => $tab_3_args,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $tabs
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $tabs
</ins><span class="cx" style="display: 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->remove_help_tab( $tab_1 );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/admin/includesTheme.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Top Level' => 'template-top-level.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Sub Dir' => 'subdir/template-sub-dir.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'This Template Header Is On One Line' => 'template-header.php',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_page_templates()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_page_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"> $theme = wp_get_theme( 'page-templates' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +67,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Top Level' => 'template-top-level.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Sub Dir' => 'subdir/template-sub-dir.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'This Template Header Is On One Line' => 'template-header.php',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_page_templates()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_page_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">@@ -83,13 +85,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Top Level' => 'template-top-level-post-types.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Sub Dir' => 'subdir/template-sub-dir-post-types.php',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_page_templates( null, 'foo' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_page_templates( null, 'foo' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSetsWithIndex(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Top Level' => 'template-top-level-post-types.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Sub Dir' => 'subdir/template-sub-dir-post-types.php',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_page_templates( null, 'post' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_page_templates( null, 'post' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array(), get_page_templates( null, 'bar' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +115,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Trailing Period, White Space.' => '38766/trailing-period-whitespace-post-types.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Trailing White Space, Period.' => '38766/trailing-whitespace-period-post-types.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Tilde in Post Type.' => '38766/tilde-post-types.php',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_page_templates( null, 'period' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_page_templates( null, 'period' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSetsWithIndex(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,7 +125,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Trailing Comma,' => '38766/trailing-comma-post-types.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Trailing Period, White Space.' => '38766/trailing-period-whitespace-post-types.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Trailing White Space, Period.' => '38766/trailing-whitespace-period-post-types.php',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_page_templates( null, 'full-stop' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_page_templates( null, 'full-stop' )
</ins><span class="cx" style="display: block; 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">@@ -139,7 +145,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Sub Dir' => 'subdir/template-sub-dir-post-types.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Top Level In A Child Theme' => 'template-top-level-post-types-child.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Sub Dir In A Child Theme' => 'subdir/template-sub-dir-post-types-child.php',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_page_templates( null, 'foo' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_page_templates( null, 'foo' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSetsWithIndex(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +153,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Top Level' => 'template-top-level-post-types.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Sub Dir' => 'subdir/template-sub-dir-post-types.php',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_page_templates( null, 'post' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_page_templates( null, 'post' )
</ins><span class="cx" style="display: 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->assertEqualSetsWithIndex(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +162,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Top Level' => 'template-top-level.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Sub Dir' => 'subdir/template-sub-dir.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'This Template Header Is On One Line' => 'template-header.php',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_page_templates()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_page_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"> $this->assertEquals( array(), get_page_templates( null, 'bar' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,7 +186,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'subdir/template-sub-dir-post-types.php' => 'Sub Dir',
</span><span class="cx" style="display: block; padding: 0 10px"> 'template-top-level-post-types-child.php' => 'Top Level In A Child Theme',
</span><span class="cx" style="display: block; padding: 0 10px"> 'subdir/template-sub-dir-post-types-child.php' => 'Sub Dir In A Child Theme',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $post_templates['foo']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $post_templates['foo']
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSetsWithIndex(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,7 +194,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'template-top-level-post-types.php' => 'Top Level',
</span><span class="cx" style="display: block; padding: 0 10px"> 'subdir/template-sub-dir-post-types.php' => 'Sub Dir',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $post_templates['post']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $post_templates['post']
</ins><span class="cx" style="display: 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->assertEqualSetsWithIndex(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,7 +203,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'template-top-level.php' => 'Top Level',
</span><span class="cx" style="display: block; padding: 0 10px"> 'subdir/template-sub-dir.php' => 'Sub Dir',
</span><span class="cx" style="display: block; padding: 0 10px"> 'template-header.php' => 'This Template Header Is On One Line',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $post_templates['page']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $post_templates['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">
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/adminbar.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'class' => 'test-class',
</span><span class="cx" style="display: block; padding: 0 10px"> 'some-meta' => 'value',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $node2->meta
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $node2->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">@@ -491,7 +492,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_admin_bar_has_no_archives_link_for_non_public_cpt() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo-non-public', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo-non-public',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'has_archive' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_in_admin_bar' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -514,7 +516,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_admin_bar_has_no_archives_link_for_cpt_without_archive() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo-non-public', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo-non-public',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'has_archive' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_in_admin_bar' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -537,7 +540,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_admin_bar_has_no_archives_link_for_cpt_not_shown_in_admin_bar() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo-non-public', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo-non-public',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'has_archive' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_in_admin_bar' => false,
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/ajax/CustomizeMenus.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +133,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'load-available-menu-items-customizer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'customize-menus-nonce' => wp_create_nonce( 'customize-menus' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $post_args
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $post_args
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make the request.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,7 +243,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'load-available-menu-items-customizer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'customize-menus-nonce' => wp_create_nonce( 'customize-menus' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $post_args
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $post_args
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make the request.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -354,7 +356,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'load-available-menu-items-customizer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'customize-menus-nonce' => wp_create_nonce( 'customize-menus' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $post_args
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $post_args
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make the request.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -537,7 +540,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'search-available-menu-items-customizer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'customize-menus-nonce' => wp_create_nonce( 'customize-menus' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $post_args
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $post_args
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_ajax_call( 'search-available-menu-items-customizer' );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/ajax/QuickEdit.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,13 +17,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_dont_process_terms_if_taxonomy_does_not_allow_show_on_quick_edit() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax_1', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax_1',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_quick_edit' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => 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"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax_2', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax_2',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_quick_edit' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/auth.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,9 +234,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $key = wp_generate_password( 20, false );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->users, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->users,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_activation_key' => strtotime( '-1 hour' ) . ':' . self::$wp_hasher->HashPassword( $key ),
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'ID' => $this->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">@@ -269,9 +271,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $key = wp_generate_password( 20, false );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->users, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->users,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_activation_key' => strtotime( '-48 hours' ) . ':' . self::$wp_hasher->HashPassword( $key ),
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'ID' => $this->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">@@ -304,9 +308,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $key = wp_generate_password( 20, false );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->users, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->users,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_activation_key' => self::$wp_hasher->HashPassword( $key ),
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'ID' => $this->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">@@ -331,9 +337,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $key = wp_generate_password( 20, false );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->users, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->users,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_activation_key' => $key,
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'ID' => $this->user->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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/canonical/pageOnFront.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'show_on_front', 'page' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'page_for_posts', self::factory()->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'page_for_posts',
+ self::factory()->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'blog-page',
</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">@@ -20,7 +21,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"> update_option(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'page_on_front', self::factory()->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'page_on_front',
+ self::factory()->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'front-page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span></span></pre></div>
<a id="trunktestsphpunittestscategorycategoryDescriptionphp"></a>
<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/categoryDescription.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/category/categoryDescription.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/category/categoryDescription.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,11 +7,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Category_CategoryDescription extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_success_query_by_id() {
</span><span class="cx" style="display: block; padding: 0 10px"> $description = 'Foo';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c = self::factory()->category->create( array(
- 'description' => $description,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c = self::factory()->category->create(
+ array(
+ 'description' => $description,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $found = category_description( $c );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found = category_description( $c );
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = apply_filters( 'term_description', $description );
</span><span class="cx" style="display: block; padding: 0 10px">
</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">@@ -19,14 +21,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_success_query_by_object() {
</span><span class="cx" style="display: block; padding: 0 10px"> $description = 'Foo';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c = self::factory()->category->create( array(
- 'description' => $description,
- 'slug' => 'bar',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c = self::factory()->category->create(
+ array(
+ 'description' => $description,
+ 'slug' => 'bar',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $category = get_term( $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">- $found = category_description( $c );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found = category_description( $c );
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = apply_filters( 'term_description', $description );
</span><span class="cx" style="display: block; padding: 0 10px">
</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">@@ -41,14 +45,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $description = '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">- $t = self::factory()->term->create( array(
- 'taxonomy' => 'wptests_tax',
- 'description' => $description,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::factory()->term->create(
+ array(
+ 'taxonomy' => 'wptests_tax',
+ 'description' => $description,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $t );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $found = category_description( $t );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found = category_description( $t );
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = apply_filters( 'term_description', $description );
</span><span class="cx" style="display: block; padding: 0 10px">
</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">@@ -63,14 +69,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $description = '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">- $t = self::factory()->term->create( array(
- 'taxonomy' => 'wptests_tax',
- 'description' => $description,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::factory()->term->create(
+ array(
+ 'taxonomy' => 'wptests_tax',
+ 'description' => $description,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> clean_term_cache( $t );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $found = category_description( $t );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found = category_description( $t );
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = apply_filters( 'term_description', $description );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $found );
</span></span></pre></div>
<a id="trunktestsphpunittestscategorygetCategoryLinkphp"></a>
<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/getCategoryLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/category/getCategoryLink.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/category/getCategoryLink.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> public function test_success() {
</span><span class="cx" style="display: block; padding: 0 10px"> $c = self::factory()->category->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">- $found = get_category_link( $c );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found = get_category_link( $c );
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = home_url( '?cat=' . $c );
</span><span class="cx" style="display: block; padding: 0 10px">
</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">@@ -20,14 +20,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_return_link_for_term_from_another_taxonomy_on_primed_cache() {
</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">- $t = self::factory()->term->create( array(
- 'taxonomy' => 'wptests_tax',
- 'slug' => 'test-term',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::factory()->term->create(
+ array(
+ 'taxonomy' => 'wptests_tax',
+ 'slug' => 'test-term',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $t );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $found = get_category_link( $t );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found = get_category_link( $t );
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = home_url( '?wptests_tax=test-term' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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">@@ -39,14 +41,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_return_link_for_term_from_another_taxonomy_on_empty_cache() {
</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">- $t = self::factory()->term->create( array(
- 'taxonomy' => 'wptests_tax',
- 'slug' => 'test-term',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::factory()->term->create(
+ array(
+ 'taxonomy' => 'wptests_tax',
+ 'slug' => 'test-term',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> clean_term_cache( $t );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $found = get_category_link( $t );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found = get_category_link( $t );
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = home_url( '?wptests_tax=test-term' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $found );
</span></span></pre></div>
<a id="trunktestsphpunittestscategorygetTheCategoryByIdphp"></a>
<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/getTheCategoryById.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/category/getTheCategoryById.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/category/getTheCategoryById.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,9 +6,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Category_GetTheCategoryById extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_success() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c = self::factory()->category->create( array(
- 'name' => 'Foo',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c = self::factory()->category->create(
+ array(
+ 'name' => 'Foo',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_the_category_by_ID( $c );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,10 +23,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_return_link_for_term_from_another_taxonomy_on_primed_cache() {
</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">- $t = self::factory()->term->create( array(
- 'taxonomy' => 'wptests_tax',
- 'name' => 'Foo',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::factory()->term->create(
+ array(
+ 'taxonomy' => 'wptests_tax',
+ 'name' => 'Foo',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $t );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,10 +43,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_return_link_for_term_from_another_taxonomy_on_empty_cache() {
</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">- $t = self::factory()->term->create( array(
- 'taxonomy' => 'wptests_tax',
- 'name' => 'Foo',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::factory()->term->create(
+ array(
+ 'taxonomy' => 'wptests_tax',
+ 'name' => 'Foo',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> clean_term_cache( $t );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestscategorywpListCategoriesphp"></a>
<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/wpListCategories.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/category/wpListCategories.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/category/wpListCategories.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +146,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', array( 'foo', 'wptests_pt', 'wptests_pt2' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = self::factory()->term->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_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">@@ -174,7 +175,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', array( 'foo', 'wptests_pt', 'wptests_pt2' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = self::factory()->term->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_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">@@ -199,7 +201,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', array( 'foo', 'wptests_pt', 'post', 'wptests_pt2' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = self::factory()->term->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_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">@@ -224,7 +227,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', array( 'foo', 'wptests_pt', 'wptests_pt2' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = self::factory()->term->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunktestsphpunittestscommentcommentsTemplatephp"></a>
<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/commentsTemplate.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/commentsTemplate.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/comment/commentsTemplate.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,7 +200,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cpage' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comments_per_page' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_permalink( $p )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_permalink( $p )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $link );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,7 +271,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cpage' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comments_per_page' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_permalink( $p )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_permalink( $p )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $link );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,7 +328,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cpage' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comments_per_page' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_permalink( $p )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_permalink( $p )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $link );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -382,7 +385,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cpage' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comments_per_page' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_permalink( $p )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_permalink( $p )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $link );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -433,7 +437,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cpage' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comments_per_page' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_permalink( $p )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_permalink( $p )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $link );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -484,7 +489,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cpage' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comments_per_page' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_permalink( $p )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_permalink( $p )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $link );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -539,7 +545,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $link_p1 = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comments_per_page' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_permalink( $p )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_permalink( $p )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $link_p1 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -558,7 +565,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cpage' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comments_per_page' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_permalink( $p )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_permalink( $p )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $link_p2 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -630,7 +638,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $link_p0 = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comments_per_page' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_permalink( $p )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_permalink( $p )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $link_p0 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -648,7 +657,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cpage' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comments_per_page' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_permalink( $p )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_permalink( $p )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $link_p2 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -668,7 +678,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cpage' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comments_per_page' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_permalink( $p )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_permalink( $p )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $link_p1 );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/comment/dateQuery.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +50,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function _get_query_result( $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_id' => $this->posts[1],
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'comment_ID', // Same order they were created
</span><span class="cx" style="display: block; padding: 0 10px"> 'order' => 'ASC',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/comment/getPageOfComment.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,8 +64,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"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, get_page_of_comment(
- $trackbacks[0], array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ get_page_of_comment(
+ $trackbacks[0],
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'per_page' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'trackback',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,8 +74,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"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 3, get_page_of_comment(
- $pingbacks[0], array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 3,
+ get_page_of_comment(
+ $pingbacks[0],
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'per_page' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'pingback',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,8 +84,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"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 5, get_page_of_comment(
- $trackbacks[0], array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 5,
+ get_page_of_comment(
+ $trackbacks[0],
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'per_page' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'pings',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,7 +142,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prime cache for trackbacks.
</span><span class="cx" style="display: block; padding: 0 10px"> $page_trackbacks = get_page_of_comment(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $trackbacks[1], array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $trackbacks[1],
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'per_page' => 3,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'trackback',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,7 +152,8 @@
</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"> $page_comments = get_page_of_comment(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'per_page' => 3,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'comment',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/comment/query.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2812,7 +2812,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_date_modified_gmt_should_order_by_comment_ID_in_case_of_tie_ASC() {
</span><span class="cx" style="display: block; padding: 0 10px"> $now = current_time( 'mysql', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $comments = self::factory()->comment->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 5, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 5,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => $now,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2836,7 +2837,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_date_modified_gmt_should_order_by_comment_ID_in_case_of_tie_DESC() {
</span><span class="cx" style="display: block; padding: 0 10px"> $now = current_time( 'mysql', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $comments = self::factory()->comment->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 5, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 5,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => $now,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3422,7 +3424,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_it_should_be_possible_to_modify_meta_query_using_pre_get_comments_action() {
</span><span class="cx" style="display: block; padding: 0 10px"> $comments = self::factory()->comment->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$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">@@ -3459,7 +3462,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_it_should_be_possible_to_modify_meta_params_using_pre_get_comments_action() {
</span><span class="cx" style="display: block; padding: 0 10px"> $comments = self::factory()->comment->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$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">@@ -3772,7 +3776,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"> $top_level_comments = self::factory()->comment->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 3, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 3,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3813,7 +3818,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"> $top_level_comments = self::factory()->comment->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 3, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 3,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3889,7 +3895,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $query_args = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_id' => self::$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">@@ -3967,7 +3974,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $query_args = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_id' => self::$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">@@ -4012,7 +4020,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"> $top_level_comments = self::factory()->comment->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 3, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 3,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4068,7 +4077,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"> $top_level_comments = self::factory()->comment->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 3, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 3,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/comment/walker.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => array( $comment_callback, 'comment' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'walker' => $comment_walker,
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), array( $comment_parent, $comment_child )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array( $comment_parent, $comment_child )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_list_comments(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,7 +41,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => array( $comment_callback, 'comment' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'walker' => $comment_walker,
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), array( $comment_child, $comment_parent )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array( $comment_child, $comment_parent )
</ins><span class="cx" style="display: block; 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="trunktestsphpunittestscommentwpCommentphp"></a>
<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/wpComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/wpComment.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/comment/wpComment.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_1 = WP_Comment::get_instance( 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $comment_1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->comments, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->comments,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_ID' => 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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/comment/wpListComments.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,7 +158,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'per_page' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 2,
</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"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> preg_match_all( '|id="comment\-([0-9]+)"|', $found, $matches );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/comment-submission.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -783,7 +783,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_parent' => '0',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_ID' => $user->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $user->ID,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $this->preprocess_comment_data
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $this->preprocess_comment_data
</ins><span class="cx" style="display: block; 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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/compat.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,10 +95,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $length = 5;
</span><span class="cx" style="display: block; padding: 0 10px"> $unset_var = 10;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $unset_var );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $heredoc = <<<EOT
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $heredoc = <<<EOT
</ins><span class="cx" style="display: block; padding: 0 10px"> hello world
</span><span class="cx" style="display: block; padding: 0 10px"> EOT;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $inputs = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $inputs = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 12345,
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/cron.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> // make sure the schedule is clear
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->plus_thirty_minutes = strtotime( '+30 minutes' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->plus_thirty_minutes = strtotime( '+30 minutes' );
</ins><span class="cx" style="display: 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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -460,7 +460,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_get_scheduled_event', array( $this, 'filter_pre_scheduled_event_hooks' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_next_scheduled', array( $this, 'filter_pre_scheduled_event_hooks' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actual = wp_get_scheduled_event( 'preflight_event', array(), $this->plus_thirty_minutes );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actual = wp_get_scheduled_event( 'preflight_event', array(), $this->plus_thirty_minutes );
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual2 = wp_next_scheduled( 'preflight_event', array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = (object) array(
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizecontrolphp"></a>
<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/control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/control.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/customize/control.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_check_capabilities() {
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px"> $control = new WP_Customize_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->wp_customize, 'blogname', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_customize,
+ 'blogname',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array( 'blogname' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +51,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $control->check_capabilities() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $control = new WP_Customize_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->wp_customize, 'blogname', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_customize,
+ 'blogname',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array( 'blogname', 'non_existing' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,12 +60,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $control->check_capabilities() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'top_secret_message', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'top_secret_message',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'top_secret_clearance',
</span><span class="cx" style="display: 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 = new WP_Customize_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->wp_customize, 'blogname', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_customize,
+ 'blogname',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array( 'blogname', 'top_secret_clearance' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,7 +75,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $control->check_capabilities() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $control = new WP_Customize_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->wp_customize, 'no_setting', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_customize,
+ 'no_setting',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'settings' => 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">@@ -75,7 +84,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $control->check_capabilities() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $control = new WP_Customize_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->wp_customize, 'no_setting', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_customize,
+ 'no_setting',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'top_secret_clearance',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,7 +94,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $control->check_capabilities() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $control = new WP_Customize_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->wp_customize, 'no_setting', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_customize,
+ 'no_setting',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'edit_theme_options',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizecustomcsssettingphp"></a>
<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/custom-css-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/custom-css-setting.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/customize/custom-css-setting.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,7 +169,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure that wp_update_custom_css_post() works as expected for updates.
</span><span class="cx" style="display: block; padding: 0 10px"> $r = wp_update_custom_css_post(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'body { color:red; }', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'body { color:red; }',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'stylesheet' => $this->setting->stylesheet,
</span><span class="cx" style="display: block; padding: 0 10px"> 'preprocessed' => "body\n\tcolor:red;",
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,7 +186,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure that wp_update_custom_css_post() works as expected for insertion.
</span><span class="cx" style="display: block; padding: 0 10px"> $r = wp_update_custom_css_post(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'body { background:black; }', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'body { background:black; }',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'stylesheet' => 'other',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,7 +216,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $updated_css = 'body { background: red; }';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = wp_update_custom_css_post(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $inserted_css, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $inserted_css,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'stylesheet' => 'testtheme',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,7 +228,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $inserted_css, $revisions[0]->post_content );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_custom_css_post(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $updated_css, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $updated_css,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'stylesheet' => 'testtheme',
</span><span 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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/customize/manager.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -550,7 +550,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'custom-background' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $existing_canola_attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'canola',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -985,12 +987,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Test saving with invalid settings, ensuring transaction blocked.
</span><span class="cx" style="display: block; padding: 0 10px"> $previous_saved_data = $saved_data;
</span><span class="cx" style="display: block; padding: 0 10px"> $manager->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo_unauthorized', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo_unauthorized',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'do_not_allow',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $manager->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'baz_illegal', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'baz_illegal',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'validate_callback' => array( $this, 'return_illegal_error' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1098,7 +1102,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize = $manager = new WP_Customize_Manager( array( 'changeset_uuid' => $uuid ) );
</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"> $manager->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'scratchpad', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'scratchpad',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'exist',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1382,18 +1387,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $manager );
</span><span class="cx" style="display: block; padding: 0 10px"> $manager->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blogfounded', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blogfounded',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $manager->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blogterminated', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blogterminated',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'do_not_allow',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $manager->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'scratchpad', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'scratchpad',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'exist',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1898,7 +1906,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function register_scratchpad_setting( WP_Customize_Manager $wp_customize ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'scratchpad', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'scratchpad',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'exist',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => array( $this, 'filter_sanitize_scratchpad' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2194,7 +2203,8 @@
</span><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"> $default_value = 'foo_default';
</span><span class="cx" style="display: block; padding: 0 10px"> $setting = $this->manager->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'validate_callback' => array( $this, 'filter_customize_validate_foo' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => array( $this, 'filter_customize_sanitize_foo' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2262,7 +2272,8 @@
</span><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"> $default_value = '0';
</span><span class="cx" style="display: block; padding: 0 10px"> $setting = $this->manager->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'numeric', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'numeric',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'validate_callback' => array( $this, 'filter_customize_validate_numeric' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => array( $this, 'filter_customize_sanitize_numeric' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2308,7 +2319,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_validate_setting_values() {
</span><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"> $setting = $this->manager->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'validate_callback' => array( $this, 'filter_customize_validate_foo' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => array( $this, 'filter_customize_sanitize_foo' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2433,7 +2445,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_validate_setting_values_validation_sanitization_order() {
</span><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"> $setting = $this->manager->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'numeric', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'numeric',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'validate_callback' => array( $this, 'filter_customize_validate_numeric' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => array( $this, 'filter_customize_sanitize_numeric' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2477,7 +2490,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_set_post_value() {
</span><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"> $this->manager->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => array( $this, 'sanitize_foo_for_test_set_post_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">@@ -2970,7 +2984,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $section_id = 'foo-section';
</span><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"> $manager->add_section(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $section_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $section_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'Section',
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2983,7 +2998,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $added_control_ids[] = $id;
</span><span class="cx" style="display: block; padding: 0 10px"> $manager->add_setting( $id );
</span><span class="cx" style="display: block; padding: 0 10px"> $control = new WP_Customize_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $manager, $id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $manager,
+ $id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'section' => $section_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'setting' => $id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3007,7 +3024,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $section_id = 'foo-section';
</span><span class="cx" style="display: block; padding: 0 10px"> $result_section = $manager->add_section(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $section_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $section_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'Section',
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3017,7 +3035,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $section_id, $result_section->id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $section = new WP_Customize_Section(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $manager, $section_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $manager,
+ $section_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'Section 2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3109,7 +3129,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $panel_id = 'foo-panel';
</span><span class="cx" style="display: block; padding: 0 10px"> $result_panel = $manager->add_panel(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $panel_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $panel_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'Test Panel',
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3119,7 +3140,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $panel_id, $result_panel->id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $panel = new WP_Customize_Panel(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $manager, $panel_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $manager,
+ $panel_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'Test Panel 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">@@ -3138,7 +3161,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $section_id = 'foo-section';
</span><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"> $manager->add_section(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $section_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $section_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'Section',
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3148,7 +3172,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $manager->add_setting( $control_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result_control = $manager->add_control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $control_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $control_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'section' => $section_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'setting' => $control_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3158,7 +3183,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $control_id, $result_control->id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $control = new WP_Customize_Control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $manager, $control_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $manager,
+ $control_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'section' => $section_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'setting' => $control_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3253,7 +3280,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $controls as $control_id => $priority ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager->add_setting( $control_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager->add_control(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $control_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $control_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'priority' => $priority,
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'foosection',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3282,7 +3310,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $sections as $section_id => $priority ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager->add_section(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $section_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $section_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'priority' => $priority,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3310,7 +3339,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $panels as $panel_id => $priority ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager->add_panel(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $panel_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $panel_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'priority' => $priority,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizenavmenuitemsettingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +154,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = wp_create_nav_menu( 'Menu' );
</span><span class="cx" style="display: block; padding: 0 10px"> $item_title = 'Greetings';
</span><span class="cx" style="display: block; padding: 0 10px"> $item_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $post_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,7 +181,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $other_menu_id = wp_create_nav_menu( 'Menu2' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $other_menu_id, $item_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $other_menu_id,
+ $item_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-title' => 'Hola',
</span><span class="cx" style="display: block; padding: 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,7 +205,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = wp_create_nav_menu( 'Menu' );
</span><span class="cx" style="display: block; padding: 0 10px"> $item_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $post_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,7 +237,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = wp_create_nav_menu( 'Menu' );
</span><span class="cx" style="display: block; padding: 0 10px"> $item_title = 'Greetings';
</span><span class="cx" style="display: block; padding: 0 10px"> $item_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $tax_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -266,7 +274,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = wp_create_nav_menu( 'Menu' );
</span><span class="cx" style="display: block; padding: 0 10px"> $item_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'custom_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'custom_object',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-title' => 'Cool beans',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,7 +320,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> $item_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $post_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,7 +355,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $secondary_menu_id = wp_create_nav_menu( 'Secondary' );
</span><span class="cx" style="display: block; padding: 0 10px"> $item_title = 'Greetings';
</span><span class="cx" style="display: block; padding: 0 10px"> $item_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $primary_menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $primary_menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $first_post_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,7 +408,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $item_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 5; $i += 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $item_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $post_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,7 +467,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $item_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 5; $i += 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $item_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $post_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -573,7 +591,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"> $nav_menu_item_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_id, 0, wp_slash(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_id,
+ 0,
+ wp_slash(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $unsanitized['object_id'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => $unsanitized['object'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -625,7 +645,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $secondary_menu_id = wp_create_nav_menu( 'Secondary' );
</span><span class="cx" style="display: block; padding: 0 10px"> $item_title = 'Greetings';
</span><span class="cx" style="display: block; padding: 0 10px"> $item_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $primary_menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $primary_menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $first_post_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -690,7 +712,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $item_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 5; $i += 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $item_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $post_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -761,7 +785,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $item_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 5; $i += 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $item_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $post_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -806,7 +832,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_invalid_nav_menu_item() {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = wp_create_nav_menu( 'Primary' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'poem', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'poem',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => 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">@@ -819,7 +846,9 @@
</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"> $item_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'poem',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $post_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -920,7 +949,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_value_as_wp_post_nav_menu_item_term_urls() {
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id = self::factory()->term->create( array( 'taxonomy' => 'category' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'press_release', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'press_release',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'has_archive' => 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">@@ -932,7 +962,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'nav_menu_item[-1]'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize->set_post_value(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $setting->id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $setting->id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'object_id' => $term_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -950,7 +981,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'nav_menu_item[-2]'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize->set_post_value(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $setting->id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $setting->id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => 'press_release',
</span><span class="cx" style="display: block; padding: 0 10px"> 'object_id' => $post_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -968,7 +1000,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'nav_menu_item[-3]'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize->set_post_value(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $setting->id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $setting->id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'post_type_archive',
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => 'press_release',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'PR',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -989,7 +1022,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_original_title() {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = wp_create_nav_menu( 'Menu' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'press_release', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'press_release',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'has_archive' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'labels' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'PRs',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1015,7 +1049,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Post: existing nav menu item.
</span><span class="cx" style="display: block; padding: 0 10px"> $nav_menu_item_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'press_release',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1044,7 +1080,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'nav_menu_item[-1]'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize->set_post_value(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $setting->id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $setting->id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'object_id' => $post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => 'press_release',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1066,7 +1103,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Term: existing nav menu item.
</span><span class="cx" style="display: block; padding: 0 10px"> $nav_menu_item_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $term_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'category',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1095,7 +1134,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'nav_menu_item[-2]'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize->set_post_value(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $setting->id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $setting->id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'object_id' => $term_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => 'category',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1117,7 +1157,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Post Type Archive: existing nav menu item.
</span><span class="cx" style="display: block; padding: 0 10px"> $nav_menu_item_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type_archive',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'press_release',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-title' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1145,7 +1187,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'nav_menu_item[-3]'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize->set_post_value(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $setting->id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $setting->id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'post_type_archive',
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => 'press_release',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => '',
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizenavmenusettingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/nav-menu-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/nav-menu-setting.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/customize/nav-menu-setting.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_menu_id = wp_create_nav_menu( wp_slash( "Parent $menu_name" ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $description = 'Hello my world \\o/.';
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = wp_update_nav_menu_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 0, wp_slash(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 0,
+ wp_slash(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-name' => $menu_name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $parent_menu_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +172,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = wp_update_nav_menu_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 0, wp_slash(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 0,
+ wp_slash(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-name' => 'Name 1 \\o/',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => 'Description 1 \\o/',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +284,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = wp_update_nav_menu_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 0, wp_slash(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 0,
+ wp_slash(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-name' => 'Name 1 \\o/',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => 'Description 1 \\o/',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,7 +354,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = wp_update_nav_menu_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 0, wp_slash(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 0,
+ wp_slash(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-name' => 'Name 1 \\o/',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => 'Description 1 \\o/',
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizenavmenusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/nav-menus.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/customize/nav-menus.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -426,7 +426,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'cat' === $args['s'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> array_unshift(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $items, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $items,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'home',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'COOL CAT!',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'custom',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -499,7 +500,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = wp_create_nav_menu( 'Primary' );
</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"> $item_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $post_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1138,7 +1141,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu = wp_create_nav_menu( 'Foo' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'custom',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-title' => 'WordPress.org',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-url' => 'https://wordpress.org',
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizepanelphp"></a>
<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/panel.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/panel.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/customize/panel.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +81,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $panel->active() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $panel = new WP_Customize_Panel(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->manager, 'foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->manager,
+ 'foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'active_callback' => '__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="trunktestsphpunittestscustomizepartialphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/partial.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/partial.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/customize/partial.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +116,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'Lorem Ipsum', $partial->render() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $partial = new WP_Customize_Partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->selective_refresh, $partial_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->selective_refresh,
+ $partial_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'settings' => 'blogdescription',
</span><span class="cx" style="display: block; padding: 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,7 +223,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_render_with_bad_callback_should_give_preference_to_return_value() {
</span><span class="cx" style="display: block; padding: 0 10px"> $partial = new WP_Customize_Partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->selective_refresh, 'foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->selective_refresh,
+ 'foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'render_callback' => array( $this, 'render_echo_and_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">@@ -236,7 +240,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_render_echo_callback() {
</span><span class="cx" style="display: block; padding: 0 10px"> $partial = new WP_Customize_Partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->selective_refresh, 'foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->selective_refresh,
+ 'foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'render_callback' => array( $this, 'render_echo' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,7 +263,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_render_return_callback() {
</span><span class="cx" style="display: block; padding: 0 10px"> $partial = new WP_Customize_Partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->selective_refresh, 'foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->selective_refresh,
+ 'foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'render_callback' => array( $this, 'render_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">@@ -319,7 +327,9 @@
</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"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px"> $partial = new WP_Customize_Partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->selective_refresh, 'blogname', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->selective_refresh,
+ 'blogname',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array( 'blogname' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,7 +336,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $partial->check_capabilities() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $partial = new WP_Customize_Partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->selective_refresh, 'blogname', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->selective_refresh,
+ 'blogname',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array( 'blogname', 'non_existing' ),
</span><span class="cx" style="display: block; padding: 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,12 +345,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $partial->check_capabilities() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'top_secret_message', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'top_secret_message',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'top_secret_clearance',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $partial = new WP_Customize_Partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->selective_refresh, 'blogname', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->selective_refresh,
+ 'blogname',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array( 'blogname', 'top_secret_clearance' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -345,7 +360,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $partial->check_capabilities() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $partial = new WP_Customize_Partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->selective_refresh, 'no_setting', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->selective_refresh,
+ 'no_setting',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'settings' => 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">@@ -352,7 +369,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $partial->check_capabilities() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $partial = new WP_Customize_Partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->selective_refresh, 'no_setting', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->selective_refresh,
+ 'no_setting',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'top_secret_clearance',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -360,7 +379,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $partial->check_capabilities() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $partial = new WP_Customize_Partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->selective_refresh, 'no_setting', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->selective_refresh,
+ 'no_setting',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'edit_theme_options',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizesectionphp"></a>
<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/section.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/section.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/customize/section.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $section->active() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $section = new WP_Customize_Section(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->manager, 'foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->manager,
+ 'foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'active_callback' => '__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="trunktestsphpunittestscustomizeselectiverefreshajaxphp"></a>
<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/selective-refresh-ajax.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/selective-refresh-ajax.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/customize/selective-refresh-ajax.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,7 +217,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->setup_valid_render_partials_request_environment();
</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"> $this->wp_customize->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'secret_message', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'secret_message',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'top_secret_clearance',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -309,7 +310,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->setup_valid_render_partials_request_environment();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize->selective_refresh->add_partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test_blogname', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test_blogname',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array( 'blogname' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'render_callback' => array( $this, 'render_callback_blogname' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -462,13 +464,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->setup_valid_render_partials_request_environment();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize->selective_refresh->add_partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test_blogname', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test_blogname',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array( 'blogname' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'render_callback' => array( $this, 'render_callback_blogname' ),
</span><span class="cx" style="display: 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->wp_customize->selective_refresh->add_partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test_blogdescription', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test_blogdescription',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array( 'blogdescription' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'render_callback' => array( $this, 'render_callback_blogdescription' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizeselectiverefreshphp"></a>
<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/selective-refresh.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/selective-refresh.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/customize/selective-refresh.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,17 +143,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px"> $user->remove_cap( 'top_secret_clearance' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'top_secret_message', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'top_secret_message',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'top_secret_clearance', // The administrator role lacks this.
</span><span class="cx" style="display: 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->selective_refresh->add_partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blogname', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blogname',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'selector' => '#site-title',
</span><span class="cx" style="display: 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->selective_refresh->add_partial(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'top_secret_message', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'top_secret_message',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array( 'top_secret_message' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/customize/setting.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -444,7 +444,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Custom type that does not handle supplying the post value from the customize_value_{$id_base} filter.
</span><span class="cx" style="display: block; padding: 0 10px"> $setting_id = 'custom_without_previewing_value_filter';
</span><span class="cx" style="display: block; padding: 0 10px"> $setting = $this->manager->add_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $setting_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $setting_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'custom_preview_test',
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => 123,
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => array( $this->manager->nav_menus, 'intval_base10' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -599,7 +600,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $name = 'autoloaded1';
</span><span class="cx" style="display: block; padding: 0 10px"> $setting = new WP_Customize_Setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->manager, $name, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->manager,
+ $name,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -612,7 +615,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $name = 'autoloaded2';
</span><span class="cx" style="display: block; padding: 0 10px"> $setting = new WP_Customize_Setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->manager, $name, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->manager,
+ $name,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="cx" style="display: block; padding: 0 10px"> 'autoload' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -626,7 +631,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $name = 'not-autoloaded1';
</span><span class="cx" style="display: block; padding: 0 10px"> $setting = new WP_Customize_Setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->manager, $name, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->manager,
+ $name,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="cx" style="display: block; padding: 0 10px"> 'autoload' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -640,12 +647,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id_base = 'multi-not-autoloaded';
</span><span class="cx" style="display: block; padding: 0 10px"> $setting1 = new WP_Customize_Setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->manager, $id_base . '[foo]', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->manager,
+ $id_base . '[foo]',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $setting2 = new WP_Customize_Setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->manager, $id_base . '[bar]', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->manager,
+ $id_base . '[bar]',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="cx" style="display: block; padding: 0 10px"> 'autoload' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -695,7 +706,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_validate() {
</span><span class="cx" style="display: block; padding: 0 10px"> $setting = new WP_Customize_Setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->manager, 'name', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->manager,
+ 'name',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'key',
</span><span class="cx" style="display: block; padding: 0 10px"> 'validate_callback' => array( $this, 'filter_validate_for_test_validate' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -735,7 +748,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $initial_value = 456;
</span><span class="cx" style="display: block; padding: 0 10px"> set_theme_mod(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'nav_menu_locations', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'nav_menu_locations',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'primary' => $initial_value,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/date/query.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -395,7 +395,8 @@
</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><span class="cx" style="display: block; padding: 0 10px"> $found = $q->build_value(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'BETWEEN', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'BETWEEN',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 2 => 4,
</span><span class="cx" style="display: block; padding: 0 10px"> 3 => 5,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -455,7 +456,8 @@
</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><span class="cx" style="display: block; padding: 0 10px"> $found = $q->build_value(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'NOT BETWEEN', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'NOT BETWEEN',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 2 => 4,
</span><span class="cx" style="display: block; padding: 0 10px"> 3 => 5,
</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,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->build_mysql_datetime(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'year' => 2011,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), true
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ true
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '2011-12-31 23:59:59', $found );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -524,7 +527,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->build_mysql_datetime(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'year' => 2011,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), false
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ false
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '2011-01-01 00:00:00', $found );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -535,7 +539,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->build_mysql_datetime(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'year' => 2011,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), false
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ false
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '2011-01-01 00:00:00', $found );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/db.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> $last = $wpdb->insert_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $rows2 = $wpdb->replace(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->users, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->users,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'ID' => $last,
</span><span class="cx" style="display: block; padding: 0 10px"> 'display_name' => 'Walter Replace Sobchak',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/dbdelta.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> $this->assertEquals( $expected, $updates );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "{$wpdb->prefix}dbdelta_create_test", $wpdb->get_var(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "{$wpdb->prefix}dbdelta_create_test",
+ $wpdb->get_var(
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->prepare(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'SHOW TABLES LIKE %s', $wpdb->esc_like( "{$wpdb->prefix}dbdelta_create_test" )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'SHOW TABLES LIKE %s',
+ $wpdb->esc_like( "{$wpdb->prefix}dbdelta_create_test" )
</ins><span class="cx" style="display: block; 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">@@ -143,7 +145,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "{$wpdb->prefix}dbdelta_test.id"
</span><span class="cx" style="display: block; padding: 0 10px"> => "Changed type of {$wpdb->prefix}dbdelta_test.id from bigint(20) to int(11)",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $updates
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $updates
</ins><span class="cx" style="display: block; 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">@@ -171,7 +174,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "{$wpdb->prefix}dbdelta_test.extra_col"
</span><span class="cx" style="display: block; padding: 0 10px"> => "Added column {$wpdb->prefix}dbdelta_test.extra_col",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $updates
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $updates
</ins><span class="cx" style="display: 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->assertTableHasColumn( 'column_1', $wpdb->prefix . 'dbdelta_test' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -222,7 +226,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> KEY key_1 (column_1({$this->max_index_length})),
</span><span class="cx" style="display: block; padding: 0 10px"> KEY compound_key (id,column_1($this->max_index_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">- ", false // Don't execute.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ",
+ false // Don't execute.
</ins><span class="cx" style="display: 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->assertEquals(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -229,7 +234,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "{$wpdb->prefix}dbdelta_test.extra_col"
</span><span class="cx" style="display: block; padding: 0 10px"> => "Added column {$wpdb->prefix}dbdelta_test.extra_col",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $updates
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $updates
</ins><span class="cx" style="display: 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->assertTableHasNotColumn( 'extra_col', $wpdb->prefix . 'dbdelta_test' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -246,7 +252,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"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array(), $insert
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array(),
+ $insert
</ins><span class="cx" style="display: 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->assertTableRowHasValue( 'column_1', 'wcphilly2015', $wpdb->prefix . 'dbdelta_test' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,7 +278,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> KEY compound_key (id,column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px"> FULLTEXT KEY fulltext_key (column_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">- ", false
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ",
+ false
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $updates );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -328,11 +336,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $table_indices = $wpdb->get_results( "SHOW INDEX FROM {$table}" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 1, wp_list_filter(
- $table_indices, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 1,
+ wp_list_filter(
+ $table_indices,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'Key_name' => 'PRIMARY',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Column_name' => $column,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'AND'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'AND'
</ins><span class="cx" style="display: block; 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">@@ -407,7 +418,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> KEY compound_key (id,column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px"> FULLTEXT KEY fulltext_key (column_1)
</span><span class="cx" style="display: block; padding: 0 10px"> ) ENGINE=MyISAM
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ", false
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ",
+ false
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array(), $result );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -431,7 +443,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> KEY compound_key (id,column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px"> FULLTEXT KEY fulltext_key (column_1)
</span><span class="cx" style="display: block; padding: 0 10px"> ) ENGINE=MyISAM
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ", false
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ",
+ false
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array(), $result );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -455,7 +468,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> KEY compound_key (id,column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px"> FULLTEXT KEY fulltext_key (column_1)
</span><span class="cx" style="display: block; padding: 0 10px"> ) ENGINE=MyISAM
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ", false
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ",
+ false
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -462,7 +476,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "{$wpdb->prefix}dbdelta_test.column_2"
</span><span class="cx" style="display: block; padding: 0 10px"> => "Changed type of {$wpdb->prefix}dbdelta_test.column_2 from text to bigtext",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $result
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $result
</ins><span class="cx" style="display: block; 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">@@ -484,7 +499,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> KEY compound_key (id,column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px"> FULLTEXT KEY fulltext_key (column_1)
</span><span class="cx" style="display: block; padding: 0 10px"> ) ENGINE=MyISAM
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ", false
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ",
+ false
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -491,7 +507,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "{$wpdb->prefix}dbdelta_test.column_3"
</span><span class="cx" style="display: block; padding: 0 10px"> => "Changed type of {$wpdb->prefix}dbdelta_test.column_3 from blob to mediumblob",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $result
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $result
</ins><span class="cx" style="display: block; 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">@@ -563,7 +580,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "{$wpdb->prefix}spatial_index_test.spatial_value2" => "Added column {$wpdb->prefix}spatial_index_test.spatial_value2",
</span><span class="cx" style="display: block; padding: 0 10px"> "Added index {$wpdb->prefix}spatial_index_test SPATIAL KEY `spatial_key2` (`spatial_value2`)",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $updates
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $updates
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}spatial_index_test" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -852,7 +870,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> KEY compOUND_key (id,column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px"> FULLTEXT KEY FULLtext_kEY (column_1)
</span><span class="cx" style="display: block; padding: 0 10px"> ) ENGINE=MyISAM
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ", false
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ",
+ false
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $updates );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -876,7 +895,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> KEY compound_key (id,column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px"> FULLTEXT KEY fulltext_key (column_1)
</span><span class="cx" style="display: block; padding: 0 10px"> ) ENGINE=MyISAM
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ", false
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ",
+ false
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $updates );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -907,7 +927,8 @@
</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="cx" style="display: block; padding: 0 10px"> "Added index {$wpdb->prefix}dbdelta_test KEY `changing_key_length` (`column_1`(20))",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $updates
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $updates
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta(
</span></span></pre></div>
<a id="trunktestsphpunittestseditorwpEditorsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/editor/wpEditors.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/editor/wpEditors.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/editor/wpEditors.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_WP_Editors extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> public function wp_link_query_callback( $results ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $results, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $results,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ID' => 123,
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'foo',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +40,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'permalink' => get_permalink( $post->ID ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'info' => mysql2date( __( 'Y/m/d' ), $post->post_date ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $actual
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $actual
</ins><span class="cx" style="display: block; 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">@@ -59,7 +61,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'permalink' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'info' => '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">- ), $actual
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $actual
</ins><span class="cx" style="display: block; 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">@@ -84,7 +87,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'permalink' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'info' => '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">- ), $actual
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $actual
</ins><span class="cx" style="display: block; 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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/feed/atom.php 2018-08-17 01:50:26 UTC (rev 43571)
</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><span class="cx" style="display: block; padding: 0 10px"> // Create a few posts
</span><span class="cx" style="display: block; padding: 0 10px"> self::$posts = $factory->post->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $count, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $count,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => self::$user_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec velit massa, ultrices eu est suscipit, mattis posuere est. Donec vitae purus lacus. Cras vitae odio odio.',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/feed/rss2.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a few posts
</span><span class="cx" style="display: block; padding: 0 10px"> self::$posts = $factory->post->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $count, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $count,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => self::$user_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => self::$post_date,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec velit massa, ultrices eu est suscipit, mattis posuere est. Donec vitae purus lacus. Cras vitae odio odio.',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/formatting/EscUrl.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'path' => '/path;p=1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'query' => 'query=2&r[]=3',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fragment' => 'fragment',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), parse_url( $url )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ parse_url( $url )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'https://user:pass@host.example.com:1234/path;p=1?query=2&r%5B%5D=3#fragment', esc_url_raw( $url ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'https://user:pass@host.example.com:1234/path;p=1?query=2&r%5B%5D=3#fragment', esc_url( $url ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,22 +84,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'http://example.com', esc_url( 'http://example.com' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '', esc_url( 'nasty://example.com/' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '', esc_url(
- 'example.com', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '',
+ esc_url(
+ 'example.com',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'https',
</span><span class="cx" style="display: block; 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"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '', esc_url(
- 'http://example.com', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '',
+ esc_url(
+ 'http://example.com',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'https',
</span><span class="cx" style="display: block; 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"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'https://example.com', esc_url(
- 'https://example.com', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'https://example.com',
+ esc_url(
+ 'https://example.com',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'http',
</span><span class="cx" style="display: block; padding: 0 10px"> 'https',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,11 +115,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( wp_allowed_protocols() as $scheme ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( "{$scheme}://example.com", esc_url( "{$scheme}://example.com" ), $scheme );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "{$scheme}://example.com", esc_url(
- "{$scheme}://example.com", array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "{$scheme}://example.com",
+ esc_url(
+ "{$scheme}://example.com",
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> $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">- ), $scheme
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,8 +131,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( ! in_array( 'foo', wp_allowed_protocols(), true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo://example.com', esc_url(
- 'foo://example.com', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo://example.com',
+ esc_url(
+ 'foo://example.com',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingMapDeepphp"></a>
<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/MapDeep.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/MapDeep.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/formatting/MapDeep.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,11 +15,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ababa',
</span><span class="cx" style="display: block; padding: 0 10px"> 'xbaba',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), map_deep(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ map_deep(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'a',
</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">- ), array( $this, 'append_baba' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array( $this, 'append_baba' )
</ins><span class="cx" style="display: block; 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">@@ -31,13 +33,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'xbaba',
</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_deep(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ map_deep(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'a',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'x',
</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( $this, 'append_baba' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array( $this, 'append_baba' )
</ins><span class="cx" style="display: block; 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">@@ -49,13 +53,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'var1' => (object) array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'var0' => 'xbaba',
</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_deep(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ map_deep(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'var0' => 'a',
</span><span class="cx" style="display: block; padding: 0 10px"> 'var1' => (object) array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'var0' => 'x',
</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( $this, 'append_baba' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array( $this, 'append_baba' )
</ins><span class="cx" style="display: block; 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">@@ -73,11 +79,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> (object) array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'var0' => 'ababa',
</span><span class="cx" style="display: block; padding: 0 10px"> 'var1' => 'xbaba',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), map_deep(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ map_deep(
</ins><span class="cx" style="display: block; padding: 0 10px"> (object) array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'var0' => 'a',
</span><span class="cx" style="display: block; padding: 0 10px"> 'var1' => 'x',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), array( $this, 'append_baba' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array( $this, 'append_baba' )
</ins><span class="cx" style="display: block; 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,13 +97,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'var1' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'xbaba',
</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_deep(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ map_deep(
</ins><span class="cx" style="display: block; padding: 0 10px"> (object) array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'var0' => 'a',
</span><span class="cx" style="display: block; padding: 0 10px"> 'var1' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'x',
</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( $this, 'append_baba' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array( $this, 'append_baba' )
</ins><span class="cx" style="display: block; 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">@@ -107,13 +117,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'var1' => (object) array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'var0' => 'xbaba',
</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_deep(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ map_deep(
</ins><span class="cx" style="display: block; padding: 0 10px"> (object) array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'var0' => 'a',
</span><span class="cx" style="display: block; padding: 0 10px"> 'var1' => (object) array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'var0' => 'x',
</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( $this, 'append_baba' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array( $this, 'append_baba' )
</ins><span class="cx" style="display: block; 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">@@ -131,7 +143,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> (object) array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'var0' => 'ababa',
</span><span class="cx" style="display: block; padding: 0 10px"> 'var1' => 'xbaba',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), map_deep( $object_b, array( $this, 'append_baba' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ map_deep( $object_b, array( $this, 'append_baba' ) )
</ins><span class="cx" style="display: block; 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,7 +161,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'var0' => 'ababa',
</span><span class="cx" style="display: block; padding: 0 10px"> 'var1' => 'xbaba',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), map_deep( $array_b, array( $this, 'append_baba' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ map_deep( $array_b, array( $this, 'append_baba' ) )
</ins><span class="cx" style="display: block; 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="trunktestsphpunittestsfunctionsanonymizationphp"></a>
<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/anonymization.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/anonymization.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/functions/anonymization.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_anonymize_with_filter() {
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_privacy_anonymize_data', array( $this, 'filter_wp_privacy_anonymize_data' ), 10, 3 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actual_url = wp_privacy_anonymize_data( 'url', 'https://example.com/author/username' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actual_url = wp_privacy_anonymize_data( 'url', 'https://example.com/author/username' );
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'wp_privacy_anonymize_data', array( $this, 'filter_wp_privacy_anonymize_data' ), 10 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://local.host/why-this-was-removed', $actual_url );
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionsgetArchivesphp"></a>
<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/getArchives.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/getArchives.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/functions/getArchives.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,8 @@
</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><span class="cx" style="display: block; padding: 0 10px"> self::$post_ids = $factory->post->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 8, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 8,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +37,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_archives_type() {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['type'] = "<li><a href='" . $this->year_url . "'>" . date( 'Y' ) . '</a></li>';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected['type'], trim(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected['type'],
+ trim(
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_get_archives(
</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">@@ -70,7 +72,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <li><a href='$link5'>$title5</a></li>
</span><span class="cx" style="display: block; padding: 0 10px"> EOF;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected['limit'], trim(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected['limit'],
+ trim(
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_get_archives(
</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">@@ -85,7 +88,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_archives_format() {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['format'] = "<option value='" . $this->month_url . "'> " . date( 'F Y' ) . ' </option>';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected['format'], trim(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected['format'],
+ trim(
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_get_archives(
</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">@@ -99,7 +103,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_archives_before_and_after() {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['before_and_after'] = "<div><a href='" . $this->month_url . "'>" . date( 'F Y' ) . '</a></div>';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected['before_and_after'], trim(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected['before_and_after'],
+ trim(
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_get_archives(
</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">@@ -115,7 +120,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_archives_show_post_count() {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['show_post_count'] = "<li><a href='" . $this->month_url . "'>" . date( 'F Y' ) . '</a> (8)</li>';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected['show_post_count'], trim(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected['show_post_count'],
+ trim(
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_get_archives(
</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">@@ -148,7 +154,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <li><a href='{$this->month_url}'>$date_full</a></li>
</span><span class="cx" style="display: block; padding: 0 10px"> EOF;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected['order_asc'], trim(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected['order_asc'],
+ trim(
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_get_archives(
</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">@@ -163,7 +170,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <li><a href='{$oct_url}'>October 2012</a></li>
</span><span class="cx" style="display: block; padding: 0 10px"> EOF;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected['order_desc'], trim(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected['order_desc'],
+ trim(
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_get_archives(
</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></pre></div>
<a id="trunktestsphpunittestsfunctionslistFilterphp"></a>
<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/listFilter.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/listFilter.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/functions/listFilter.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,10 +42,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_filter_object_list_and() {
</span><span class="cx" style="display: block; padding: 0 10px"> $list = wp_filter_object_list(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->object_list, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->object_list,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'field1' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'field2' => true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'AND'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'AND'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 2, count( $list ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'foo', $list );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,10 +56,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_filter_object_list_or() {
</span><span class="cx" style="display: block; padding: 0 10px"> $list = wp_filter_object_list(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->object_list, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->object_list,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'field1' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'field2' => true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'OR'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'OR'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 3, count( $list ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'foo', $list );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,10 +71,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_filter_object_list_not() {
</span><span class="cx" style="display: block; padding: 0 10px"> $list = wp_filter_object_list(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->object_list, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->object_list,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'field2' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'field3' => true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'NOT'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'NOT'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, count( $list ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'baz', $list );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,40 +84,51 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_filter_object_list_and_field() {
</span><span class="cx" style="display: block; padding: 0 10px"> $list = wp_filter_object_list(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->object_list, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->object_list,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'field1' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'field2' => true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'AND', 'name'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'AND',
+ 'name'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</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="cx" style="display: block; padding: 0 10px"> 'foo' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bar' => 'bar',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $list
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $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">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_filter_object_list_or_field() {
</span><span class="cx" style="display: block; padding: 0 10px"> $list = wp_filter_object_list(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->object_list, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->object_list,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'field2' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'field3' => true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'OR', 'name'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'OR',
+ 'name'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</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="cx" style="display: block; padding: 0 10px"> 'foo' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bar' => 'bar',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $list
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $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">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_filter_object_list_not_field() {
</span><span class="cx" style="display: block; padding: 0 10px"> $list = wp_filter_object_list(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->object_list, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->object_list,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'field2' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'field3' => true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'NOT', 'name'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'NOT',
+ 'name'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( 'baz' => 'baz' ), $list );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,7 +140,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bar' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'baz' => 'baz',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $list
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $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"> $list = wp_list_pluck( $this->array_list, 'name' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +150,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bar' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'baz' => 'baz',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $list
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +165,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'f' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'b' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'z' => 'baz',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $list
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,7 +180,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'f' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'b' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'z' => 'baz',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $list
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,7 +195,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 0 => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 1 => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 2 => 'baz',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $list
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,7 +212,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'f' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 0 => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'z' => 'baz',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $list
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,7 +229,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'f' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'b' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'z' => 'baz',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $list
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,10 +299,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_filter_object_list_nested_array_or() {
</span><span class="cx" style="display: block; padding: 0 10px"> $list = wp_filter_object_list(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->object_list, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->object_list,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'field3' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'field4' => array( 'blue' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'OR'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'OR'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 2, count( $list ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'foo', $list );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -303,22 +329,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'baz' => 'baz',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $list
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $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">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_filter_object_list_nested_array_or_field() {
</span><span class="cx" style="display: block; padding: 0 10px"> $list = wp_filter_object_list(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->object_list, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->object_list,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'field3' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'field4' => array( 'blue' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'OR', 'name'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'OR',
+ 'name'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</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="cx" style="display: block; padding: 0 10px"> 'foo' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'baz' => 'baz',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $list
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $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"> }
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/functions.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '_baba' => 5,
</span><span class="cx" style="display: block; padding: 0 10px"> 'yZ' => 'baba',
</span><span class="cx" style="display: block; padding: 0 10px"> 'a' => array( 5, 111, 'x' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), wp_parse_args( $x )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ wp_parse_args( $x )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $y = new MockClass;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array(), wp_parse_args( $y ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +35,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '_baba' => 5,
</span><span class="cx" style="display: block; padding: 0 10px"> 'yZ' => 'baba',
</span><span class="cx" style="display: block; padding: 0 10px"> 'a' => array( 5, 111, 'x' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), wp_parse_args( $b )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ wp_parse_args( $b )
</ins><span class="cx" style="display: block; 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">@@ -50,7 +52,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '_baba' => 5,
</span><span class="cx" style="display: block; padding: 0 10px"> 'yZ' => 'baba',
</span><span class="cx" style="display: block; padding: 0 10px"> 'a' => array( 5, 111, 'x' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), wp_parse_args( $x, $d )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ wp_parse_args( $x, $d )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $e = array( '_baba' => 6 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +61,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '_baba' => 5,
</span><span class="cx" style="display: block; padding: 0 10px"> 'yZ' => 'baba',
</span><span class="cx" style="display: block; padding: 0 10px"> 'a' => array( 5, 111, 'x' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), wp_parse_args( $x, $e )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ wp_parse_args( $x, $e )
</ins><span class="cx" style="display: block; 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">@@ -299,19 +303,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( "$url?foo=1", add_query_arg( 'foo', '1', $url ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( "$url?foo=1", add_query_arg( array( 'foo' => '1' ), $url ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "$url?foo=2", add_query_arg(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "$url?foo=2",
+ add_query_arg(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => '2',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $url
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $url
</ins><span class="cx" style="display: 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->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "$url?foo=1&bar=2", add_query_arg(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "$url?foo=1&bar=2",
+ add_query_arg(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bar' => '2',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $url
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $url
</ins><span class="cx" style="display: block; 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">@@ -320,7 +328,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( "$url?foo=1", add_query_arg( 'foo', '1' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( "$url?foo=1", add_query_arg( array( 'foo' => '1' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "$url?foo=2", add_query_arg(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "$url?foo=2",
+ add_query_arg(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => '2',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -328,7 +337,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"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "$url?foo=1&bar=2", add_query_arg(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "$url?foo=1&bar=2",
+ add_query_arg(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bar' => '2',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -344,19 +354,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( "$url?foo=1#frag", add_query_arg( 'foo', '1', $frag_url ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( "$url?foo=1#frag", add_query_arg( array( 'foo' => '1' ), $frag_url ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "$url?foo=2#frag", add_query_arg(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "$url?foo=2#frag",
+ add_query_arg(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => '2',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $frag_url
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $frag_url
</ins><span class="cx" style="display: 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->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "$url?foo=1&bar=2#frag", add_query_arg(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "$url?foo=1&bar=2#frag",
+ add_query_arg(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bar' => '2',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $frag_url
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $frag_url
</ins><span class="cx" style="display: block; 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">@@ -365,7 +379,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( "$url?foo=1#frag", add_query_arg( 'foo', '1' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( "$url?foo=1#frag", add_query_arg( array( 'foo' => '1' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "$url?foo=2#frag", add_query_arg(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "$url?foo=2#frag",
+ add_query_arg(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => '2',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -373,7 +388,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"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "$url?foo=1&bar=2#frag", add_query_arg(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "$url?foo=1&bar=2#frag",
+ add_query_arg(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bar' => '2',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -400,19 +416,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( "$url&foo=1", add_query_arg( 'foo', '1', $url ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( "$url&foo=1", add_query_arg( array( 'foo' => '1' ), $url ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "$url&foo=2", add_query_arg(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "$url&foo=2",
+ add_query_arg(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => '2',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $url
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $url
</ins><span class="cx" style="display: 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->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "$url&foo=1&bar=2", add_query_arg(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "$url&foo=1&bar=2",
+ add_query_arg(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bar' => '2',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $url
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $url
</ins><span class="cx" style="display: block; 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,7 +441,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( "$url&foo=1", add_query_arg( 'foo', '1' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( "$url&foo=1", add_query_arg( array( 'foo' => '1' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "$url&foo=2", add_query_arg(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "$url&foo=2",
+ add_query_arg(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => '2',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -429,7 +450,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"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "$url&foo=1&bar=2", add_query_arg(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "$url&foo=1&bar=2",
+ add_query_arg(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bar' => '2',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -452,7 +474,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> '1' => '2',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), '1=1'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ '1=1'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '1=2&foo=bar', $url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1270,7 +1293,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Test a few additional file types on single sites.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> // Standard non-image file.
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> DIR_TESTDATA . '/formatting/big5.txt',
</span></span></pre></div>
<a id="trunktestsphpunittestsgeneraldocumenttitlephp"></a>
<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/document-title.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/document-title.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/general/document-title.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_front_page_title() {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'show_on_front', 'page' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'page_on_front', $this->factory->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'page_on_front',
+ $this->factory->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'front-page',
</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">@@ -184,7 +185,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_post_type_archive_title() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'cpt', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'cpt',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'has_archive' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'labels' => array(
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/general/paginateLinks.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,7 +205,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 's' => 'search+term',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $url
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $url
</ins><span class="cx" style="display: block; 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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/general/template.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -366,7 +366,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $this->custom_logo_id, '_wp_attachment_image_alt', $image_alt );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $image = wp_get_attachment_image(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->custom_logo_id, 'full', false, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->custom_logo_id,
+ 'full',
+ false,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'class' => 'custom-logo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'itemprop' => 'logo',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/http/base.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,7 +137,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_redirect_on_head() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Redirections on HEAD request when Requested
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_request(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->redirection_script . '?rt=' . 5, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->redirection_script . '?rt=' . 5,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'redirection' => 5,
</span><span class="cx" style="display: block; padding: 0 10px"> 'method' => 'HEAD',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,7 +209,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test 301 - POST to POST
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_request(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'method' => 'PUT',
</span><span class="cx" style="display: block; padding: 0 10px"> 'timeout' => 30,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,7 +257,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = $this->fileStreamUrl;
</span><span class="cx" style="display: block; padding: 0 10px"> $size = 153204;
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_request(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url,
+ array(
</ins><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"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +285,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = $this->fileStreamUrl;
</span><span class="cx" style="display: block; padding: 0 10px"> $size = 10000;
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_request(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url,
+ array(
</ins><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"> 'limit_response_size' => $size,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,7 +315,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $size = 10000;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_request(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url,
+ array(
</ins><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"> )
</span></span></pre></div>
<a id="trunktestsphpunittestshttpcurlphp"></a>
<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/curl.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/http/curl.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/http/curl.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_http_api_curl_stream_parameter_is_a_reference() {
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'http_api_curl', array( $this, '_action_test_http_api_curl_stream_parameter_is_a_reference' ), 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_remote_request(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->fileStreamUrl, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->fileStreamUrl,
+ array(
</ins><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"> )
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/http/functions.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,7 +148,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = 'http://example.org';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_get(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'cookies' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_Http_Cookie(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,7 +180,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = 'http://example.org';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_get(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'cookies' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'test' => 'foo',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/http/http.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,7 +190,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'path' => '/path',
</span><span class="cx" style="display: block; padding: 0 10px"> 'query' => 'arg1=value1&arg2=value2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fragment' => 'anchor',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $actual
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $actual
</ins><span class="cx" style="display: block; 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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/image/editor.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,7 +122,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $property = new ReflectionProperty( $editor, 'size' );
</span><span class="cx" style="display: block; padding: 0 10px"> $property->setAccessible( true );
</span><span class="cx" style="display: block; padding: 0 10px"> $property->setValue(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $editor,
+ array(
</ins><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="cx" style="display: block; padding: 0 10px"> )
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/image/functions.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -308,7 +308,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $file = wp_crop_image(
</span><span class="cx" style="display: block; padding: 0 10px"> DIR_TESTDATA . '/images/canola.jpg',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 0, 0, 100, 100, 100, 100
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 0,
+ 0,
+ 100,
+ 100,
+ 100,
+ 100
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFileExists( $file );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -331,7 +336,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $file = wp_crop_image(
</span><span class="cx" style="display: block; padding: 0 10px"> 'https://asdftestblog1.files.wordpress.com/2008/04/canola.jpg',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 0, 0, 100, 100, 100, 100, false,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 0,
+ 0,
+ 100,
+ 100,
+ 100,
+ 100,
+ false,
</ins><span class="cx" style="display: block; padding: 0 10px"> DIR_TESTDATA . '/images/' . __FUNCTION__ . '.jpg'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $file );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -347,7 +358,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_crop_image_file_not_exist() {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = wp_crop_image(
</span><span class="cx" style="display: block; padding: 0 10px"> DIR_TESTDATA . '/images/canoladoesnotexist.jpg',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 0, 0, 100, 100, 100, 100
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 0,
+ 0,
+ 100,
+ 100,
+ 100,
+ 100
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $file );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -359,7 +375,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $file = wp_crop_image(
</span><span class="cx" style="display: block; padding: 0 10px"> 'https://asdftestblog1.files.wordpress.com/2008/04/canoladoesnotexist.jpg',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 0, 0, 100, 100, 100, 100
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 0,
+ 0,
+ 100,
+ 100,
+ 100,
+ 100
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $file );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -377,7 +398,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $file = wp_crop_image(
</span><span class="cx" style="display: block; padding: 0 10px"> DIR_TESTDATA . '/images/canola.jpg',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 0, 0, 100, 100, 100, 100
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 0,
+ 0,
+ 100,
+ 100,
+ 100,
+ 100
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -398,7 +424,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> copy( $orig_file, $test_file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'application/pdf',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -461,7 +489,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> copy( $orig_file, $test_file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'application/pdf',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -519,7 +549,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> copy( $orig_file, $test_file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'application/pdf',
</span><span class="cx" style="display: block; padding: 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 +609,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> copy( DIR_TESTDATA . '/images/wordpress-gsoc-flyer.pdf', $pdf_path );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pdf_path, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pdf_path,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'application/pdf',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/import/import.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -264,7 +264,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'def1' => array( 'def1' ),
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_importers()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_importers()
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_importers = $_wp_importers; // Restore global state
</span><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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/import/parser.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,7 +68,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'author_display_name' => 'John Doe',
</span><span class="cx" style="display: block; padding: 0 10px"> 'author_first_name' => 'John',
</span><span class="cx" style="display: block; padding: 0 10px"> 'author_last_name' => 'Doe',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $result['authors']['john'], $message
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $result['authors']['john'],
+ $message
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</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">@@ -77,7 +79,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'category_parent' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'cat_name' => 'alpha',
</span><span class="cx" style="display: block; padding: 0 10px"> 'category_description' => 'The alpha category',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $result['categories'][0], $message
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $result['categories'][0],
+ $message
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</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">@@ -85,7 +89,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'tag_slug' => 'clippable',
</span><span class="cx" style="display: block; padding: 0 10px"> 'tag_name' => 'Clippable',
</span><span class="cx" style="display: block; padding: 0 10px"> 'tag_description' => 'The Clippable post_tag',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $result['tags'][0], $message
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $result['tags'][0],
+ $message
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</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">@@ -95,7 +101,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'term_parent' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'term_name' => 'bieup',
</span><span class="cx" style="display: block; padding: 0 10px"> 'term_description' => 'The bieup post_tax',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $result['terms'][0], $message
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $result['terms'][0],
+ $message
</ins><span class="cx" style="display: 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->assertEquals( 2, count( $result['posts'] ), $message );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,7 +126,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bieup',
</span><span class="cx" style="display: block; padding: 0 10px"> 'domain' => 'post_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">- ), $result['posts'][0]['terms'], $message
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $result['posts'][0]['terms'],
+ $message
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</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">@@ -126,7 +136,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'key' => '_wp_page_template',
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => 'default',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $result['posts'][1]['postmeta'], $message
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $result['posts'][1]['postmeta'],
+ $message
</ins><span class="cx" style="display: block; 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">@@ -159,7 +171,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'uncategorized',
</span><span class="cx" style="display: block; padding: 0 10px"> 'domain' => '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">- ), $result['posts'][0]['terms'], $message
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $result['posts'][0]['terms'],
+ $message
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</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">@@ -178,7 +192,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'roar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'domain' => '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">- ), $result['posts'][2]['terms'], $message
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $result['posts'][2]['terms'],
+ $message
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</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">@@ -197,7 +213,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'face',
</span><span class="cx" style="display: block; padding: 0 10px"> 'domain' => '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">- ), $result['posts'][3]['terms'], $message
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $result['posts'][3]['terms'],
+ $message
</ins><span class="cx" style="display: 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->assertEquals(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,7 +224,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'key' => '_wp_page_template',
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => 'default',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $result['posts'][1]['postmeta'], $message
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $result['posts'][1]['postmeta'],
+ $message
</ins><span class="cx" style="display: block; 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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/link/getAdjacentPost.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +93,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Bump term_taxonomy to mimic shared term offsets.
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->term_taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->term_taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'term_id' => 12345,
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -250,7 +251,8 @@
</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><span class="cx" style="display: block; padding: 0 10px"> $terms = self::factory()->term->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_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">@@ -283,7 +285,8 @@
</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><span class="cx" style="display: block; padding: 0 10px"> $terms = self::factory()->term->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunktestsphpunittestslinkgetPostCommentsFeedLinkphp"></a>
<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/getPostCommentsFeedLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link/getPostCommentsFeedLink.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/link/getPostCommentsFeedLink.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'feed' => get_default_feed(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'p' => $post_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), home_url( '/' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ home_url( '/' )
</ins><span class="cx" style="display: 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->assertEquals( $expected, $link );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +33,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_attachment_link() {
</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"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image.jpg', $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image.jpg',
+ $post_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +46,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'feed' => get_default_feed(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'p' => $attachment_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), home_url( '/' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ home_url( '/' )
</ins><span class="cx" style="display: 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->assertEquals( $expected, $link );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +62,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"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image.jpg', $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image.jpg',
+ $post_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Burrito',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,7 +84,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image.jpg', $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image.jpg',
+ $post_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +100,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_unattached_link() {
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image.jpg', 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image.jpg',
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +113,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'feed' => get_default_feed(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'attachment_id' => $attachment_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), home_url( '/' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ home_url( '/' )
</ins><span class="cx" style="display: 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->assertEquals( $expected, $link );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,7 +124,9 @@
</span><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"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image.jpg', 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image.jpg',
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunktestsphpunittestslinkgetPreviewPostLinkphp"></a>
<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/getPreviewPostLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link/getPreviewPostLink.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/link/getPreviewPostLink.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,12 +19,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bar' => 'baz',
</span><span class="cx" style="display: block; padding: 0 10px"> 'preview' => 'true',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_permalink( $post )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_permalink( $post )
</ins><span class="cx" style="display: 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->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected, get_preview_post_link(
- $post, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected,
+ get_preview_post_link(
+ $post,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bar' => 'baz',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,11 +41,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = 'https://google.com/?foo=bar&bar=baz&preview=true';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected, get_preview_post_link(
- $post, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected,
+ get_preview_post_link(
+ $post,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bar' => 'baz',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'https://google.com/'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'https://google.com/'
</ins><span class="cx" style="display: block; 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">@@ -63,7 +69,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_preview_post_link_should_return_empty_string_for_non_viewable_post_type() {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'non_viewable_cpt', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'non_viewable_cpt',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => 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="trunktestsphpunittestslinkwpGetCanonicalURLphp"></a>
<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/wpGetCanonicalURL.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link/wpGetCanonicalURL.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/link/wpGetCanonicalURL.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'bar',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_permalink( self::$post_id )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_permalink( self::$post_id )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $link );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,7 +60,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_permalink( self::$post_id )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_permalink( self::$post_id )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, wp_get_canonical_url( self::$post_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +78,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => $page,
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'bar',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_permalink( self::$post_id )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_permalink( self::$post_id )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $link );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +99,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cpage' => $cpage,
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'bar',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_permalink( self::$post_id )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_permalink( self::$post_id )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $link );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,7 +108,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cpage' => $cpage,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_permalink( self::$post_id ) . '#comments'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_permalink( self::$post_id ) . '#comments'
</ins><span class="cx" style="display: 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->assertEquals( $expected, wp_get_canonical_url( self::$post_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,7 +128,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cpage' => $cpage,
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'bar',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_permalink( self::$post_id )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_permalink( self::$post_id )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $link );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/link.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +139,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'wptests_pt',
</span><span class="cx" style="display: block; padding: 0 10px"> 'p' => $p,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), trailingslashit( home_url() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ trailingslashit( home_url() )
</ins><span class="cx" style="display: 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->assertEquals( $non_pretty_permalink, get_permalink( $p ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,7 +153,9 @@
</span><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"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image.jpg', 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image.jpg',
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'An Attachment!',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,7 +183,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_type' => 'not_a_post_type' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image.jpg', $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image.jpg',
+ $post_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'An Attachment!',
</span></span></pre></div>
<a id="trunktestsphpunittestsmediagetAttachmentTaxonomiesphp"></a>
<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/getAttachmentTaxonomies.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/media/getAttachmentTaxonomies.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/media/getAttachmentTaxonomies.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'attachment' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $a = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image.jpg', 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image.jpg',
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +28,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'attachment:image' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $a = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image.jpg', 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image.jpg',
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +47,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'attachment:image/jpeg' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $a = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image.jpg', 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image.jpg',
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,7 +66,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'attachment:jpg' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $a = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image.jpg', 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image.jpg',
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +85,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', array( 'attachment', 'attachment:image/jpeg' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $a = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image.jpg', 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image.jpg',
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,7 +107,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax2', 'attachment:image' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $a = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image.jpg', 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image.jpg',
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,7 +131,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax2', array( 'attachment:image', 'attachment:image/jpeg' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $a = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image.jpg', 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image.jpg',
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/media.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -403,7 +403,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add attachment metadata without sizes.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_attachment_metadata(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'width' => 50,
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => 50,
</span><span class="cx" style="display: block; padding: 0 10px"> 'file' => 'test-image.jpg',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -460,7 +461,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_attached_images() {
</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"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->img_name, $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->img_name,
+ $post_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -478,7 +481,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ids1_srcs = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( range( 1, 3 ) as $i ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "image$i.jpg", 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "image$i.jpg",
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -493,7 +498,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ids2_srcs = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( range( 4, 6 ) as $i ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "image$i.jpg", 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "image$i.jpg",
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -624,7 +631,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ids1_srcs = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( range( 1, 3 ) as $i ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "image$i.jpg", 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "image$i.jpg",
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -639,7 +648,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ids2_srcs = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( range( 4, 6 ) as $i ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "image$i.jpg", 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "image$i.jpg",
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1035,7 +1046,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_attachment_url_to_postid() {
</span><span class="cx" style="display: block; padding: 0 10px"> $image_path = '2014/11/' . $this->img_name;
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image_path, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image_path,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1048,7 +1061,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_attachment_url_to_postid_schemes() {
</span><span class="cx" style="display: block; padding: 0 10px"> $image_path = '2014/11/' . $this->img_name;
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image_path, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image_path,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1064,7 +1079,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_attachment_url_to_postid_filtered() {
</span><span class="cx" style="display: block; padding: 0 10px"> $image_path = '2014/11/' . $this->img_name;
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image_path, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image_path,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1110,7 +1127,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = media_handle_upload(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'upload', 0, array(), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'upload',
+ 0,
+ array(),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'test_iptc_upload',
</span><span class="cx" style="display: block; padding: 0 10px"> 'test_form' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1146,7 +1166,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = media_handle_upload(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'upload', 0, array(), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'upload',
+ 0,
+ array(),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'test_upload_titles',
</span><span class="cx" style="display: block; padding: 0 10px"> 'test_form' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1312,7 +1335,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->img_name, $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->img_name,
+ $post_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1333,7 +1358,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->img_name, $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->img_name,
+ $post_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => $caption,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1351,7 +1378,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_attachment_caption_empty() {
</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"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->img_name, $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->img_name,
+ $post_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2376,7 +2405,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_id = self::factory()->post->create( array( 'post_date' => '2010-01-01' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = media_handle_upload(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'upload', $parent_id, array(), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'upload',
+ $parent_id,
+ array(),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'test_iptc_upload',
</span><span class="cx" style="display: block; padding: 0 10px"> 'test_form' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2425,7 +2457,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parent = get_post( $parent_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = media_handle_upload(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'upload', $parent_id, array(), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'upload',
+ $parent_id,
+ array(),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'test_iptc_upload',
</span><span class="cx" style="display: block; padding: 0 10px"> 'test_form' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunktestsphpunittestsmenuwpAjaxMenuQuickSearchphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/menu/wpAjaxMenuQuickSearch.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/menu/wpAjaxMenuQuickSearch.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/menu/wpAjaxMenuQuickSearch.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> include_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"> self::factory()->post->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 3, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 3,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunktestsphpunittestsmetaregisterMetaphp"></a>
<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/registerMeta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/meta/registerMeta.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/meta/registerMeta.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,7 +68,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'auth' => 10,
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize' => 10,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $has_filters
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $has_filters
</ins><span class="cx" style="display: block; 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">@@ -430,23 +431,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_meta( $type, 'registered_key1', array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This will override the above registration for objects of $subtype.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- register_meta( $type, 'registered_key1', array(
- 'object_subtype' => $subtype,
- 'single' => true,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_meta(
+ $type,
+ 'registered_key1',
+ array(
+ 'object_subtype' => $subtype,
+ 'single' => true,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // For testing with $single => false.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- register_meta( $type, 'registered_key2', array(
- 'object_subtype' => $subtype,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_meta(
+ $type,
+ 'registered_key2',
+ array(
+ 'object_subtype' => $subtype,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Register another meta key for a different subtype.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- register_meta( $type, 'registered_key3', array(
- 'object_subtype' => 'other_subtype',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_meta(
+ $type,
+ 'registered_key3',
+ array(
+ 'object_subtype' => 'other_subtype',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $object_property_name = $type . '_id';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $object_id = self::$$object_property_name;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $object_id = self::$$object_property_name;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_metadata( $type, $object_id, 'registered_key1', 'value1' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_metadata( $type, $object_id, 'registered_key2', 'value2' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -473,7 +486,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_object_subtype( $type, $expected_subtype ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $object_property_name = $type . '_id';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $object_id = self::$$object_property_name;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $object_id = self::$$object_property_name;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected_subtype, get_object_subtype( $type, $object_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/meta.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +144,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test EXISTS and NOT EXISTS together, no users should be found
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 0, count(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 0,
+ count(
</ins><span class="cx" style="display: block; padding: 0 10px"> get_users(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +164,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"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, count(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ count(
</ins><span class="cx" style="display: block; padding: 0 10px"> get_users(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,7 +182,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> delete_metadata( 'user', $this->author->ID, 'meta_key' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, count(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ count(
</ins><span class="cx" style="display: block; padding: 0 10px"> get_users(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitegetBlogDetailsphp"></a>
<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/getBlogDetails.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/getBlogDetails.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/multisite/getBlogDetails.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,7 +152,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'domain' => 'wordpress.org',
</span><span class="cx" style="display: block; padding: 0 10px"> 'path' => '/',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $get_all
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $get_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"> $result = array_keys( get_object_vars( $site ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,7 +171,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'domain' => 'wordpress.org',
</span><span class="cx" style="display: block; padding: 0 10px"> 'path' => '/',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $get_all
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $get_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"> $result = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,7 +208,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $all ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $fields, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fields,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'blogname',
</span><span class="cx" style="display: block; padding: 0 10px"> 'siteurl',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_count',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/multisite/site.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> * @group multisite
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Multisite_Site extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $suppress = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected $suppress = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> protected $site_status_hooks = array();
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $network_ids;
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $site_ids;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1459,13 +1459,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_update_site_cleans_cache() {
</span><span class="cx" style="display: block; padding: 0 10px"> $site_id = self::factory()->blog->create();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $site1 = get_site( $site_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site1 = get_site( $site_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = wp_update_site( $site_id, array( 'public' => 0 ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $site2 = get_site( $site_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site2 = get_site( $site_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = wp_update_site( $site_id, array( 'public' => 1 ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $site3 = get_site( $site_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site3 = get_site( $site_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $site1->public );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $site2->public );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1709,11 +1709,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_site_dates_are_gmt() {
</span><span class="cx" style="display: block; padding: 0 10px"> $first_date = current_time( 'mysql', true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $site_id = wp_insert_site( array(
- 'domain' => 'valid-domain.com',
- 'path' => '/valid-path/',
- 'network_id' => 1,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site_id = wp_insert_site(
+ array(
+ 'domain' => 'valid-domain.com',
+ 'path' => '/valid-path/',
+ 'network_id' => 1,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'integer', $site_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $site = get_site( $site_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1749,26 +1751,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $old_domain = 'old.wordpress.org';
</span><span class="cx" style="display: block; padding: 0 10px"> $new_domain = 'new.wordpress.org';
</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 = self::factory()->blog->create_and_get( array(
- 'domain' => $old_domain,
- 'path' => '/',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site = self::factory()->blog->create_and_get(
+ array(
+ 'domain' => $old_domain,
+ 'path' => '/',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Populate the caches.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_blog_details( array(
- 'domain' => $old_domain,
- 'path' => '/',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_blog_details(
+ array(
+ 'domain' => $old_domain,
+ 'path' => '/',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> get_blog_id_from_url( $old_domain, '/' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_blog_details( array(
- 'domain' => $new_domain,
- 'path' => '/',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_blog_details(
+ array(
+ 'domain' => $new_domain,
+ 'path' => '/',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> get_blog_id_from_url( $new_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">- wp_update_site( $site->id, array(
- 'domain' => $new_domain,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_site(
+ $site->id,
+ array(
+ 'domain' => $new_domain,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $domain_path_key_old = md5( $old_domain . '/' );
</span><span class="cx" style="display: block; padding: 0 10px"> $domain_path_key_new = md5( $new_domain . '/' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1795,26 +1806,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $old_path = '/foo/';
</span><span class="cx" style="display: block; padding: 0 10px"> $new_path = '/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">- $site = self::factory()->blog->create_and_get( array(
- 'domain' => 'test.wordpress.org',
- 'path' => $old_path,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site = self::factory()->blog->create_and_get(
+ array(
+ 'domain' => 'test.wordpress.org',
+ 'path' => $old_path,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Populate the caches.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_blog_details( array(
- 'domain' => 'test.wordpress.org',
- 'path' => $old_path,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_blog_details(
+ array(
+ 'domain' => 'test.wordpress.org',
+ 'path' => $old_path,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> get_blog_id_from_url( 'test.wordpress.org', $old_path );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_blog_details( array(
- 'domain' => 'test.wordpress.org',
- 'path' => $new_path,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_blog_details(
+ array(
+ 'domain' => 'test.wordpress.org',
+ 'path' => $new_path,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> get_blog_id_from_url( 'test.wordpress.org', $new_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">- wp_update_site( $site->id, array(
- 'path' => $new_path,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_site(
+ $site->id,
+ array(
+ 'path' => $new_path,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $domain_path_key_old = md5( 'test.wordpress.org' . $old_path );
</span><span class="cx" style="display: block; padding: 0 10px"> $domain_path_key_new = md5( 'test.wordpress.org' . $new_path );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1840,10 +1860,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // First: Insert a site.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->listen_to_site_status_hooks();
</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_data = array_merge( array(
- 'domain' => 'example-site.com',
- 'path' => '/',
- ), $insert_site_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site_data = array_merge(
+ array(
+ 'domain' => 'example-site.com',
+ 'path' => '/',
+ ),
+ $insert_site_data
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $site_id = wp_insert_site( $site_data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitesiteMetaphp"></a>
<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/siteMeta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/siteMeta.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/multisite/siteMeta.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,376 +2,407 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) :
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**
- * @group ms-site
- * @group multisite
- * @group meta
- * @ticket 37923
- */
-class Tests_Multisite_Site_Meta extends WP_UnitTestCase {
- protected static $site_id;
- protected static $site_id2;
- protected static $flag_was_set;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @group ms-site
+ * @group multisite
+ * @group meta
+ * @ticket 37923
+ */
+ class Tests_Multisite_Site_Meta extends WP_UnitTestCase {
+ protected static $site_id;
+ protected static $site_id2;
+ protected static $flag_was_set;
</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 static function wpSetUpBeforeClass( $factory ) {
- self::$site_id = $factory->blog->create( array( 'domain' => 'wordpress.org', 'path' => '/' ) );
- self::$site_id2 = $factory->blog->create( array( 'domain' => 'wordpress.org', 'path' => '/foo/' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function wpSetUpBeforeClass( $factory ) {
+ self::$site_id = $factory->blog->create(
+ array(
+ 'domain' => 'wordpress.org',
+ 'path' => '/',
+ )
+ );
+ self::$site_id2 = $factory->blog->create(
+ array(
+ 'domain' => 'wordpress.org',
+ 'path' => '/foo/',
+ )
+ );
</ins><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 main network flag as necessary.
- self::$flag_was_set = true;
- if ( false === get_network_option( get_main_network_id(), 'site_meta_supported', false ) ) {
- self::$flag_was_set = false;
- is_site_meta_supported();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Populate the main network flag as necessary.
+ self::$flag_was_set = true;
+ if ( false === get_network_option( get_main_network_id(), 'site_meta_supported', false ) ) {
+ self::$flag_was_set = false;
+ is_site_meta_supported();
+ }
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function wpTearDownAfterClass() {
- // Delete the possibly previously populated main network flag.
- if ( ! self::$flag_was_set ) {
- delete_network_option( get_main_network_id(), 'site_meta_supported' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function wpTearDownAfterClass() {
+ // Delete the possibly previously populated main network flag.
+ if ( ! self::$flag_was_set ) {
+ delete_network_option( get_main_network_id(), 'site_meta_supported' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wpmu_delete_blog( self::$site_id, true );
- wpmu_delete_blog( self::$site_id2, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wpmu_delete_blog( self::$site_id, true );
+ wpmu_delete_blog( self::$site_id2, 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">- wp_update_network_site_counts();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_network_site_counts();
+ }
</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_is_site_meta_supported() {
- $this->assertTrue( is_site_meta_supported() );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_site_meta_supported() {
+ $this->assertTrue( is_site_meta_supported() );
+ }
</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_is_site_meta_supported_filtered() {
- add_filter( 'pre_site_option_site_meta_supported', '__return_zero' );
- $this->assertFalse( is_site_meta_supported() );
- }
-
- public function test_add() {
- if ( ! is_site_meta_supported() ) {
- $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_site_meta_supported_filtered() {
+ add_filter( 'pre_site_option_site_meta_supported', '__return_zero' );
+ $this->assertFalse( is_site_meta_supported() );
</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">- $this->assertNotEmpty( add_site_meta( self::$site_id, 'foo', 'bar' ) );
- $this->assertSame( 'bar', get_site_meta( self::$site_id, 'foo', true ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add() {
+ if ( ! is_site_meta_supported() ) {
+ $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
+ }
</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_add_unique() {
- if ( ! is_site_meta_supported() ) {
- $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotEmpty( add_site_meta( self::$site_id, 'foo', 'bar' ) );
+ $this->assertSame( 'bar', get_site_meta( self::$site_id, 'foo', true ) );
</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">- $this->assertNotEmpty( add_site_meta( self::$site_id, 'foo', 'bar' ) );
- $this->assertFalse( add_site_meta( self::$site_id, 'foo', 'bar', true ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_add_unique() {
+ if ( ! is_site_meta_supported() ) {
+ $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
+ }
</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_delete() {
- if ( ! is_site_meta_supported() ) {
- $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotEmpty( add_site_meta( self::$site_id, 'foo', 'bar' ) );
+ $this->assertFalse( add_site_meta( self::$site_id, 'foo', 'bar', true ) );
</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">- add_site_meta( self::$site_id, 'foo', 'bar' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_delete() {
+ if ( ! is_site_meta_supported() ) {
+ $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
+ }
</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->assertTrue( delete_site_meta( self::$site_id, 'foo' ) );
- $this->assertEmpty( get_site_meta( self::$site_id, 'foo', true ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_site_meta( self::$site_id, 'foo', '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">- public function test_delete_with_invalid_meta_key_should_return_false() {
- if ( ! is_site_meta_supported() ) {
- $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( delete_site_meta( self::$site_id, 'foo' ) );
+ $this->assertEmpty( get_site_meta( self::$site_id, 'foo', true ) );
</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">- $this->assertFalse( delete_site_meta( self::$site_id, 'foo' ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_delete_with_invalid_meta_key_should_return_false() {
+ if ( ! is_site_meta_supported() ) {
+ $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
+ }
</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_delete_should_respect_meta_value() {
- if ( ! is_site_meta_supported() ) {
- $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( delete_site_meta( self::$site_id, 'foo' ) );
</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">- add_site_meta( self::$site_id, 'foo', 'bar' );
- add_site_meta( self::$site_id, 'foo', 'baz' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_delete_should_respect_meta_value() {
+ if ( ! is_site_meta_supported() ) {
+ $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
+ }
</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->assertTrue( delete_site_meta( self::$site_id, 'foo', 'bar' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_site_meta( self::$site_id, 'foo', 'bar' );
+ add_site_meta( self::$site_id, 'foo', 'baz' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $metas = get_site_meta( self::$site_id, 'foo' );
- $this->assertSame( array( 'baz' ), $metas );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( delete_site_meta( self::$site_id, 'foo', '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">- public function test_get_with_no_key_should_fetch_all_keys() {
- if ( ! is_site_meta_supported() ) {
- $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $metas = get_site_meta( self::$site_id, 'foo' );
+ $this->assertSame( array( 'baz' ), $metas );
</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">- add_site_meta( self::$site_id, 'foo', 'bar' );
- add_site_meta( self::$site_id, 'foo1', 'baz' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_with_no_key_should_fetch_all_keys() {
+ if ( ! is_site_meta_supported() ) {
+ $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $found = get_site_meta( self::$site_id );
- $expected = array(
- 'foo' => array( 'bar' ),
- 'foo1' => array( 'baz' ),
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_site_meta( self::$site_id, 'foo', 'bar' );
+ add_site_meta( self::$site_id, 'foo1', 'baz' );
</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->assertEqualSets( $expected, $found );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found = get_site_meta( self::$site_id );
+ $expected = array(
+ 'foo' => array( 'bar' ),
+ 'foo1' => array( 'baz' ),
+ );
</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_get_with_key_should_fetch_all_for_key() {
- if ( ! is_site_meta_supported() ) {
- $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSets( $expected, $found );
</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">- add_site_meta( self::$site_id, 'foo', 'bar' );
- add_site_meta( self::$site_id, 'foo', 'baz' );
- add_site_meta( self::$site_id, 'foo1', 'baz' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_with_key_should_fetch_all_for_key() {
+ if ( ! is_site_meta_supported() ) {
+ $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $found = get_site_meta( self::$site_id, 'foo' );
- $expected = array( 'bar', 'baz' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_site_meta( self::$site_id, 'foo', 'bar' );
+ add_site_meta( self::$site_id, 'foo', 'baz' );
+ add_site_meta( self::$site_id, 'foo1', 'baz' );
</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->assertEqualSets( $expected, $found );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found = get_site_meta( self::$site_id, 'foo' );
+ $expected = array( 'bar', 'baz' );
</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_get_should_respect_single_true() {
- if ( ! is_site_meta_supported() ) {
- $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSets( $expected, $found );
</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">- add_site_meta( self::$site_id, 'foo', 'bar' );
- add_site_meta( self::$site_id, 'foo', 'baz' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_should_respect_single_true() {
+ if ( ! is_site_meta_supported() ) {
+ $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $found = get_site_meta( self::$site_id, 'foo', true );
- $this->assertSame( 'bar', $found );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_site_meta( self::$site_id, 'foo', 'bar' );
+ add_site_meta( self::$site_id, 'foo', 'baz' );
</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_update_should_pass_to_add_when_no_value_exists_for_key() {
- if ( ! is_site_meta_supported() ) {
- $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found = get_site_meta( self::$site_id, 'foo', true );
+ $this->assertSame( 'bar', $found );
</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">- $actual = update_site_meta( self::$site_id, 'foo', 'bar' );
- $this->assertInternalType( 'int', $actual );
- $this->assertNotEmpty( $actual );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_should_pass_to_add_when_no_value_exists_for_key() {
+ if ( ! is_site_meta_supported() ) {
+ $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta = get_site_meta( self::$site_id, 'foo', true );
- $this->assertSame( 'bar', $meta );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actual = update_site_meta( self::$site_id, 'foo', 'bar' );
+ $this->assertInternalType( 'int', $actual );
+ $this->assertNotEmpty( $actual );
</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_update_should_return_true_when_updating_existing_value_for_key() {
- if ( ! is_site_meta_supported() ) {
- $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta = get_site_meta( self::$site_id, 'foo', true );
+ $this->assertSame( 'bar', $meta );
</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">- add_site_meta( self::$site_id, 'foo', 'bar' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_should_return_true_when_updating_existing_value_for_key() {
+ if ( ! is_site_meta_supported() ) {
+ $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actual = update_site_meta( self::$site_id, 'foo', 'baz' );
- $this->assertTrue( $actual );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_site_meta( self::$site_id, 'foo', '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">- $meta = get_site_meta( self::$site_id, 'foo', true );
- $this->assertSame( 'baz', $meta );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actual = update_site_meta( self::$site_id, 'foo', 'baz' );
+ $this->assertTrue( $actual );
</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_delete_by_key() {
- if ( ! is_site_meta_supported() ) {
- $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta = get_site_meta( self::$site_id, 'foo', true );
+ $this->assertSame( 'baz', $meta );
</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">- add_site_meta( self::$site_id, 'unique_delete_by_key', 'value', true );
- add_site_meta( self::$site_id2, 'unique_delete_by_key', 'value', true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_delete_by_key() {
+ if ( ! is_site_meta_supported() ) {
+ $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
+ }
</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->assertEquals( 'value', get_site_meta( self::$site_id, 'unique_delete_by_key', true ) );
- $this->assertEquals( 'value', get_site_meta( self::$site_id2, 'unique_delete_by_key', true ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_site_meta( self::$site_id, 'unique_delete_by_key', 'value', true );
+ add_site_meta( self::$site_id2, 'unique_delete_by_key', 'value', 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">- $this->assertTrue( delete_site_meta_by_key( 'unique_delete_by_key' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 'value', get_site_meta( self::$site_id, 'unique_delete_by_key', true ) );
+ $this->assertEquals( 'value', get_site_meta( self::$site_id2, 'unique_delete_by_key', 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">- $this->assertEquals( '', get_site_meta( self::$site_id, 'unique_delete_by_key', true ) );
- $this->assertEquals( '', get_site_meta( self::$site_id2, 'unique_delete_by_key', true ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( delete_site_meta_by_key( 'unique_delete_by_key' ) );
</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_site_meta_should_be_deleted_when_site_is_deleted() {
- if ( ! is_site_meta_supported() ) {
- $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( '', get_site_meta( self::$site_id, 'unique_delete_by_key', true ) );
+ $this->assertEquals( '', get_site_meta( self::$site_id2, 'unique_delete_by_key', true ) );
</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">- $site_id = self::factory()->blog->create( array( 'domain' => 'foo.org', 'path' => '/' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_site_meta_should_be_deleted_when_site_is_deleted() {
+ if ( ! is_site_meta_supported() ) {
+ $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
+ }
</ins><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_meta( $site_id, 'foo', 'bar' );
- add_site_meta( $site_id, 'foo1', 'bar' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site_id = self::factory()->blog->create(
+ array(
+ 'domain' => 'foo.org',
+ 'path' => '/',
+ )
+ );
</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->assertSame( 'bar', get_site_meta( $site_id, 'foo', true ) );
- $this->assertSame( 'bar', get_site_meta( $site_id, 'foo1', true ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_site_meta( $site_id, 'foo', 'bar' );
+ add_site_meta( $site_id, 'foo1', '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">- wpmu_delete_blog( $site_id, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'bar', get_site_meta( $site_id, 'foo', true ) );
+ $this->assertSame( 'bar', get_site_meta( $site_id, 'foo1', 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">- $this->assertSame( '', get_site_meta( $site_id, 'foo', true ) );
- $this->assertSame( '', get_site_meta( $site_id, 'foo1', true ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wpmu_delete_blog( $site_id, 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">- public function test_update_site_meta_cache() {
- global $wpdb;
-
- if ( ! is_site_meta_supported() ) {
- $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( '', get_site_meta( $site_id, 'foo', true ) );
+ $this->assertSame( '', get_site_meta( $site_id, 'foo1', true ) );
</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">- update_site_meta( self::$site_id, 'foo', 'bar' );
- update_sitemeta_cache( array( self::$site_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_site_meta_cache() {
+ global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $num_queries = $wpdb->num_queries;
- get_site_meta( self::$site_id, 'foo', true );
- $this->assertSame( $num_queries, $wpdb->num_queries);
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_site_meta_supported() ) {
+ $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
+ }
</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_query_update_site_meta_cache_true() {
- global $wpdb;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_site_meta( self::$site_id, 'foo', 'bar' );
+ update_sitemeta_cache( array( self::$site_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">- if ( ! is_site_meta_supported() ) {
- $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $num_queries = $wpdb->num_queries;
+ get_site_meta( self::$site_id, 'foo', true );
+ $this->assertSame( $num_queries, $wpdb->num_queries );
</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">- update_site_meta( self::$site_id, 'foo', 'bar' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_update_site_meta_cache_true() {
+ global $wpdb;
</ins><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 include 'update_site_meta_cache' as true as its the default.
- new WP_Site_Query( array(
- 'ID' => self::$site_id,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_site_meta_supported() ) {
+ $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $num_queries = $wpdb->num_queries;
- get_site_meta( self::$site_id, 'foo', true );
- $this->assertSame( $num_queries, $wpdb->num_queries);
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_site_meta( self::$site_id, 'foo', '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">- public function test_query_update_site_meta_cache_false() {
- global $wpdb;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Do not include 'update_site_meta_cache' as true as its the default.
+ new WP_Site_Query(
+ array(
+ 'ID' => self::$site_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">- if ( ! is_site_meta_supported() ) {
- $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $num_queries = $wpdb->num_queries;
+ get_site_meta( self::$site_id, 'foo', true );
+ $this->assertSame( $num_queries, $wpdb->num_queries );
</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">- update_site_meta( self::$site_id, 'foo', 'bar' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_query_update_site_meta_cache_false() {
+ global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- new WP_Site_Query( array(
- 'ID' => self::$site_id,
- 'update_site_meta_cache' => false,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_site_meta_supported() ) {
+ $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $num_queries = $wpdb->num_queries;
- get_site_meta( self::$site_id, 'foo', true );
- $this->assertSame( $num_queries + 1, $wpdb->num_queries);
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_site_meta( self::$site_id, 'foo', '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">- /**
- * @ticket 40229
- */
- public function test_add_site_meta_should_bust_get_sites_cache() {
- if ( ! is_site_meta_supported() ) {
- $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ new WP_Site_Query(
+ array(
+ 'ID' => self::$site_id,
+ 'update_site_meta_cache' => false,
+ )
+ );
+
+ $num_queries = $wpdb->num_queries;
+ get_site_meta( self::$site_id, 'foo', true );
+ $this->assertSame( $num_queries + 1, $wpdb->num_queries );
</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">- add_site_meta( self::$site_id, 'foo', 'bar' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 40229
+ */
+ public function test_add_site_meta_should_bust_get_sites_cache() {
+ if ( ! is_site_meta_supported() ) {
+ $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
+ }
</ins><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.
- $found = get_sites( array(
- 'fields' => 'ids',
- 'meta_query' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_site_meta( self::$site_id, 'foo', 'bar' );
+
+ // Prime cache.
+ $found = get_sites(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'key' => 'foo',
- 'value' => 'bar',
- ),
- ),
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'fields' => 'ids',
+ 'meta_query' => array(
+ array(
+ 'key' => 'foo',
+ 'value' => '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">- $this->assertEqualSets( array( self::$site_id ), $found );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSets( array( self::$site_id ), $found );
</ins><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_meta( self::$site_id2, 'foo', 'bar' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_site_meta( self::$site_id2, 'foo', '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">- $found = get_sites( array(
- 'fields' => 'ids',
- 'meta_query' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found = get_sites(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'key' => 'foo',
- 'value' => 'bar',
- ),
- ),
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'fields' => 'ids',
+ 'meta_query' => array(
+ array(
+ 'key' => 'foo',
+ 'value' => '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">- $this->assertEqualSets( array( self::$site_id, self::$site_id2 ), $found );
- }
-
- /**
- * @ticket 40229
- */
- public function test_update_site_meta_should_bust_get_sites_cache() {
- if ( ! is_site_meta_supported() ) {
- $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSets( array( self::$site_id, self::$site_id2 ), $found );
</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">- add_site_meta( self::$site_id, 'foo', 'bar' );
- add_site_meta( self::$site_id2, 'foo', 'baz' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 40229
+ */
+ public function test_update_site_meta_should_bust_get_sites_cache() {
+ if ( ! is_site_meta_supported() ) {
+ $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
+ }
</ins><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.
- $found = get_sites( array(
- 'fields' => 'ids',
- 'meta_query' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_site_meta( self::$site_id, 'foo', 'bar' );
+ add_site_meta( self::$site_id2, 'foo', 'baz' );
+
+ // Prime cache.
+ $found = get_sites(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'key' => 'foo',
- 'value' => 'bar',
- ),
- ),
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'fields' => 'ids',
+ 'meta_query' => array(
+ array(
+ 'key' => 'foo',
+ 'value' => '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">- $this->assertEqualSets( array( self::$site_id ), $found );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSets( array( self::$site_id ), $found );
</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_site_meta( self::$site_id2, 'foo', 'bar' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_site_meta( self::$site_id2, 'foo', '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">- $found = get_sites( array(
- 'fields' => 'ids',
- 'meta_query' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found = get_sites(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'key' => 'foo',
- 'value' => 'bar',
- ),
- ),
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'fields' => 'ids',
+ 'meta_query' => array(
+ array(
+ 'key' => 'foo',
+ 'value' => '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">- $this->assertEqualSets( array( self::$site_id, self::$site_id2 ), $found );
- }
-
- /**
- * @ticket 40229
- */
- public function test_delete_site_meta_should_bust_get_sites_cache() {
- if ( ! is_site_meta_supported() ) {
- $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSets( array( self::$site_id, self::$site_id2 ), $found );
</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">- add_site_meta( self::$site_id, 'foo', 'bar' );
- add_site_meta( self::$site_id2, 'foo', 'bar' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 40229
+ */
+ public function test_delete_site_meta_should_bust_get_sites_cache() {
+ if ( ! is_site_meta_supported() ) {
+ $this->markTestSkipped( 'Tests only runs with the blogmeta database table installed' );
+ }
</ins><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.
- $found = get_sites( array(
- 'fields' => 'ids',
- 'meta_query' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_site_meta( self::$site_id, 'foo', 'bar' );
+ add_site_meta( self::$site_id2, 'foo', 'bar' );
+
+ // Prime cache.
+ $found = get_sites(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'key' => 'foo',
- 'value' => 'bar',
- ),
- ),
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'fields' => 'ids',
+ 'meta_query' => array(
+ array(
+ 'key' => 'foo',
+ 'value' => '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">- $this->assertEqualSets( array( self::$site_id, self::$site_id2 ), $found );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSets( array( self::$site_id, self::$site_id2 ), $found );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- delete_site_meta( self::$site_id2, 'foo', 'bar' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ delete_site_meta( self::$site_id2, 'foo', '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">- $found = get_sites( array(
- 'fields' => 'ids',
- 'meta_query' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found = get_sites(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'key' => 'foo',
- 'value' => 'bar',
- ),
- ),
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'fields' => 'ids',
+ 'meta_query' => array(
+ array(
+ 'key' => 'foo',
+ 'value' => '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">- $this->assertEqualSets( array( self::$site_id ), $found );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSets( array( self::$site_id ), $found );
+ }
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisiteupdateBlogDetailsphp"></a>
<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/updateBlogDetails.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/updateBlogDetails.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/multisite/updateBlogDetails.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = update_blog_details(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'domain' => 'example.com',
</span><span class="cx" style="display: block; padding: 0 10px"> 'path' => 'my_path/',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunktestsphpunittestsoembedWpEmbedphp"></a>
<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/WpEmbed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/WpEmbed.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/oembed/WpEmbed.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,13 +61,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'youtube_embed_url',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), array_keys( $GLOBALS['wp_embed']->handlers[10] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array_keys( $GLOBALS['wp_embed']->handlers[10] )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'audio',
</span><span class="cx" style="display: block; padding: 0 10px"> 'video',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), array_keys( $GLOBALS['wp_embed']->handlers[9999] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array_keys( $GLOBALS['wp_embed']->handlers[9999] )
</ins><span class="cx" style="display: block; 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="trunktestsphpunittestsoembeddiscoveryphp"></a>
<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/discovery.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/discovery.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/oembed/discovery.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> function test_add_oembed_discovery_links_static_front_page() {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'show_on_front', 'page' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'page_on_front', self::factory()->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'page_on_front',
+ self::factory()->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'front-page',
</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">@@ -69,7 +70,9 @@
</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"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $file, $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $file,
+ $post_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunktestsphpunittestsoembedgetResponseDataphp"></a>
<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/getResponseData.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/getResponseData.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/oembed/getResponseData.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 400,
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => 225,
</span><span class="cx" style="display: block; padding: 0 10px"> 'html' => get_post_embed_html( 400, 225, $post ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $data
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $data
</ins><span class="cx" style="display: block; 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">@@ -64,7 +65,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 400,
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => 225,
</span><span class="cx" style="display: block; padding: 0 10px"> 'html' => get_post_embed_html( 400, 225, $post ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $data
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $data
</ins><span class="cx" style="display: block; 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">@@ -88,7 +90,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'author_url' => get_home_url( '/' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'Some Post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'link',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $data
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $data
</ins><span class="cx" style="display: 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_filter( 'oembed_response_data', 'get_oembed_response_data_rich', 10, 4 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,7 +164,9 @@
</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"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $file, $post->ID, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $file,
+ $post->ID,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,7 +184,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parent = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $file, $parent, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $file,
+ $parent,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunktestsphpunittestsoembedtemplatephp"></a>
<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/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/template.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/oembed/template.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +43,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $file, $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $file,
+ $post_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 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,7 +85,9 @@
</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"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $file, $post->ID, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $file,
+ $post->ID,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Hello World',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Foo Bar',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,7 +248,9 @@
</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"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $file, $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $file,
+ $post_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionregistrationphp"></a>
<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/registration.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/registration.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/option/registration.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_register_with_array() {
</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">- 'test_group', 'test_option', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test_group',
+ 'test_option',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => array( $this, 'filter_registered_setting' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +48,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_register_with_default() {
</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">- 'test_group', 'test_default', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test_group',
+ 'test_default',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => 'Got that Viper with them rally stripes',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,7 +63,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_register_with_default_override() {
</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">- 'test_group', 'test_default', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test_group',
+ 'test_default',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => 'Got that Viper with them rally stripes',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +80,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_option_with_no_options_cache() {
</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">- 'test_group', 'test_default', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test_group',
+ 'test_default',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => 'My 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">@@ -102,7 +110,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_unregister_setting_removes_default() {
</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">- 'test_group', 'test_default', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test_group',
+ 'test_default',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => 'Got that Viper with them rally stripes',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/pluggable.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,7 +263,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Pluggable function signatures are not tested when an external object cache is in use. #31491
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $signatures, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $signatures,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // wp-includes/cache.php:
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_cache_add' => array(
</span></span></pre></div>
<a id="trunktestsphpunittestspomomophp"></a>
<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/mo.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pomo/mo.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/pomo/mo.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Project-Id-Version' => 'WordPress 2.6-bleeding',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Report-Msgid-Bugs-To' => 'wp-polyglots@lists.automattic.com',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $mo->headers
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $mo->headers
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 2, count( $mo->entries ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( 'dyado' ), $mo->entries['baba']->translations );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/pomo/po.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'msgid "baba"
</span><span class="cx" style="display: block; padding: 0 10px"> msgid_plural "babas"
</span><span class="cx" style="display: block; padding: 0 10px"> msgstr[0] ""
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-msgstr[1] ""', $po->export_entry( $entry )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+msgstr[1] ""',
+ $po->export_entry( $entry )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +104,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '# baba
</span><span class="cx" style="display: block; padding: 0 10px"> # dyado
</span><span class="cx" style="display: block; padding: 0 10px"> msgid "baba"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-msgstr ""', $po->export_entry( $entry )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+msgstr ""',
+ $po->export_entry( $entry )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,7 +116,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><span class="cx" style="display: block; padding: 0 10px"> '#. baba
</span><span class="cx" style="display: block; padding: 0 10px"> msgid "baba"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-msgstr ""', $po->export_entry( $entry )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+msgstr ""',
+ $po->export_entry( $entry )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +131,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28
</span><span class="cx" style="display: block; padding: 0 10px"> #: 29
</span><span class="cx" style="display: block; padding: 0 10px"> msgid "baba"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-msgstr ""', $po->export_entry( $entry )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+msgstr ""',
+ $po->export_entry( $entry )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,7 +160,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><span class="cx" style="display: block; padding: 0 10px"> 'msgid "baba"
</span><span class="cx" style="display: block; padding: 0 10px"> msgid_plural "babas"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-msgstr[0] "кукубуку"', $po->export_entry( $entry )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+msgstr[0] "кукубуку"',
+ $po->export_entry( $entry )
</ins><span class="cx" style="display: 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 = new Translation_Entry(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +176,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> msgid_plural "babas"
</span><span class="cx" style="display: block; padding: 0 10px"> msgstr[0] "кукубуку"
</span><span class="cx" style="display: block; padding: 0 10px"> msgstr[1] "кукуруку"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-msgstr[2] "бабаяга"', $po->export_entry( $entry )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+msgstr[2] "бабаяга"',
+ $po->export_entry( $entry )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> // context
</span><span class="cx" style="display: block; padding: 0 10px"> $entry = new Translation_Entry(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,7 +196,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> msgid_plural "babas"
</span><span class="cx" style="display: block; padding: 0 10px"> msgstr[0] "кукубуку"
</span><span class="cx" style="display: block; padding: 0 10px"> msgstr[1] "кукуруку"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-msgstr[2] "бабаяга"', $po->export_entry( $entry )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+msgstr[2] "бабаяга"',
+ $po->export_entry( $entry )
</ins><span class="cx" style="display: block; 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">@@ -250,7 +257,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Project-Id-Version' => 'WordPress 2.6-bleeding',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Plural-Forms' => 'nplurals=2; plural=n != 1;',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $po->headers
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $po->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"> $simple_entry = new Translation_Entry( array( 'singular' => 'moon' ) );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/pomo/translations.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> $entry->key() => $entry,
</span><span class="cx" style="display: block; padding: 0 10px"> $entry2->key() => $entry2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $po->entries
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $po->entries
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> // add empty entry
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, $po->add_entry( $empty ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +31,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> $entry->key() => $entry,
</span><span class="cx" style="display: block; padding: 0 10px"> $entry2->key() => $entry2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $po->entries
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $po->entries
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // give add_entry() the arguments and let it create the entry itself
</span></span></pre></div>
<a id="trunktestsphpunittestspostgetBodyClassphp"></a>
<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/getBodyClass.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/getBodyClass.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/post/getBodyClass.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,7 +187,9 @@
</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><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image.jpg', $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image.jpg',
+ $post_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/post/getPages.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +107,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_cache_should_be_invalidated_by_add_post_meta() {
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = self::factory()->post->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => '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">@@ -142,7 +143,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_cache_should_be_invalidated_by_update_post_meta() {
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = self::factory()->post->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => '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">@@ -178,7 +180,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_cache_should_be_invalidated_by_delete_post_meta() {
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = self::factory()->post->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => '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">@@ -214,7 +217,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_cache_should_be_invalidated_by_delete_post_meta_by_key() {
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = self::factory()->post->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => '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">@@ -255,7 +259,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[2], 'some-meta-key', '1' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 1, count(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 1,
+ count(
</ins><span class="cx" style="display: block; padding: 0 10px"> get_pages(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_key' => 'some-meta-key',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,7 +270,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 1, count(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 1,
+ count(
</ins><span class="cx" style="display: block; padding: 0 10px"> get_pages(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_key' => 'some-meta-key',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -618,7 +624,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_list_pages_classes() {
</span><span class="cx" style="display: block; padding: 0 10px"> $type = 'taco';
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $type, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $type,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunktestsphpunittestspostgetPostTypeLabelsphp"></a>
<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/getPostTypeLabels.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/getPostTypeLabels.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/post/getPostTypeLabels.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,43 +5,54 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Get_Post_Type_Labels extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_returns_an_object() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'object', get_post_type_labels( (object) array(
- 'name' => 'foo',
- 'labels' => array(),
- 'hierarchical' => false,
- ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertInternalType(
+ 'object',
+ get_post_type_labels(
+ (object) array(
+ 'name' => 'foo',
+ 'labels' => array(),
+ 'hierarchical' => false,
+ )
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_returns_hierachical_labels() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $labels = get_post_type_labels( (object) array(
- 'name' => 'foo',
- 'labels' => array(),
- 'hierarchical' => true,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $labels = get_post_type_labels(
+ (object) array(
+ 'name' => 'foo',
+ 'labels' => array(),
+ 'hierarchical' => true,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Pages', $labels->name );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_existing_labels_are_not_overridden() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $labels = get_post_type_labels( (object) array(
- 'name' => 'foo',
- 'labels' => array(
- 'singular_name' => 'Foo',
- ),
- 'hierarchical' => false,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $labels = get_post_type_labels(
+ (object) array(
+ 'name' => 'foo',
+ 'labels' => array(
+ 'singular_name' => 'Foo',
+ ),
+ 'hierarchical' => false,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Foo', $labels->singular_name );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_name_admin_bar_label_should_fall_back_to_singular_name() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $labels = get_post_type_labels( (object) array(
- 'name' => 'foo',
- 'labels' => array(
- 'singular_name' => 'Foo',
- ),
- 'hierarchical' => false,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $labels = get_post_type_labels(
+ (object) array(
+ 'name' => 'foo',
+ 'labels' => array(
+ 'singular_name' => 'Foo',
+ ),
+ 'hierarchical' => false,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Foo', $labels->name_admin_bar );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,33 +59,40 @@
</span><span class="cx" style="display: 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_name_admin_bar_label_should_fall_back_to_post_type_name() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $labels = get_post_type_labels( (object) array(
- 'name' => 'bar',
- 'labels' => array(),
- 'hierarchical' => false,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $labels = get_post_type_labels(
+ (object) array(
+ 'name' => 'bar',
+ 'labels' => array(),
+ 'hierarchical' => false,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'bar', $labels->name_admin_bar );
</span><span class="cx" style="display: 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_menu_name_should_fall_back_to_name() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $labels = get_post_type_labels( (object) array(
- 'name' => 'foo',
- 'labels' => array(
- 'name' => 'Bar',
- ),
- 'hierarchical' => false,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $labels = get_post_type_labels(
+ (object) array(
+ 'name' => 'foo',
+ 'labels' => array(
+ 'name' => 'Bar',
+ ),
+ 'hierarchical' => false,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Bar', $labels->menu_name );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_labels_should_be_added_when_registering_a_post_type() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_type_object = register_post_type( 'foo', array(
- 'labels' => array(
- 'singular_name' => 'bar',
- ),
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_type_object = register_post_type(
+ 'foo',
+ array(
+ 'labels' => array(
+ 'singular_name' => 'bar',
+ ),
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> unregister_post_type( 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,11 +102,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"> public function test_label_should_be_derived_from_labels_when_registering_a_post_type() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_type_object = register_post_type( 'foo', array(
- 'labels' => array(
- 'name' => 'bar',
- ),
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_type_object = register_post_type(
+ 'foo',
+ array(
+ 'labels' => array(
+ 'name' => 'bar',
+ ),
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'bar', $post_type_object->label );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestspostisPostTypeViewablephp"></a>
<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/isPostTypeViewable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/isPostTypeViewable.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/post/isPostTypeViewable.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +6,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Post_IsPostTypeViewable extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_return_false_for_non_publicly_queryable_types() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_pt', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_pt',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'publicly_queryable' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +21,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_return_true_for_publicly_queryable_types() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_pt', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_pt',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'publicly_queryable' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +36,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_return_false_for_builtin_nonpublic_types() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_pt', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_pt',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'publicly_queryable' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +51,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_return_false_for_nonbuiltin_public_types() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_pt', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_pt',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'publicly_queryable' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +66,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_return_true_for_builtin_public_types() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_pt', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_pt',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'publicly_queryable' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,7 +92,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_accept_post_type_name() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_pt', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_pt',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'publicly_queryable' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => false,
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/post/meta.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,19 +19,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function wpSetUpBeforeClass( $factory ) {
</span><span class="cx" style="display: block; padding: 0 10px"> self::$author = $factory->user->create_and_get( array( '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">- self::$post_id = $factory->post->create( array(
- 'post_author' => self::$author->ID,
- 'post_status' => 'publish',
- 'post_content' => rand_str(),
- 'post_title' => rand_str(),
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$post_id = $factory->post->create(
+ array(
+ 'post_author' => self::$author->ID,
+ 'post_status' => 'publish',
+ 'post_content' => rand_str(),
+ 'post_title' => rand_str(),
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$post_id_2 = $factory->post->create( array(
- 'post_author' => self::$author->ID,
- 'post_status' => 'publish',
- 'post_content' => rand_str(),
- 'post_title' => rand_str(),
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$post_id_2 = $factory->post->create(
+ array(
+ 'post_author' => self::$author->ID,
+ 'post_status' => 'publish',
+ 'post_content' => rand_str(),
+ 'post_title' => rand_str(),
+ )
+ );
</ins><span class="cx" style="display: 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 wpTearDownAfterClass() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -304,5 +308,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'page', 'registered_key2' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '', 'registered_key3' ),
</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"> }
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/post/nav-menu.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tag_id = self::factory()->tag->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'post_tag',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $tag_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +51,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $page_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tag_insert = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'post_tag',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $tag_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +62,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"> $cat_insert = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $cat_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +73,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"> $post_insert = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $post_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +85,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Item without menu-item-object arg
</span><span class="cx" style="display: block; padding: 0 10px"> $post_2_insert = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $post_2_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-status' => 'publish',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,7 +95,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"> $page_insert = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $page_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +144,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create an orphan nav menu item
</span><span class="cx" style="display: block; padding: 0 10px"> $custom_item_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 0, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 0,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'custom',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-title' => 'Wordpress.org',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-link' => 'http://wordpress.org',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +160,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Update the orphan with an associated nav menu
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, $custom_item_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ $custom_item_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-title' => 'WordPress.org',
</span><span class="cx" style="display: block; padding: 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,7 +177,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $child_terms = self::factory()->term->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,7 +185,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"> $term_menu_item = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $t,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,7 +235,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // This is the expected array of menu names
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'nav_menu', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'nav_menu',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'name',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,7 +258,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_slug = rand_str( 12 );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_description = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_type_slug, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_type_slug,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'has_archive' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => $post_type_description,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,7 +268,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"> $post_type_archive_item_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type_archive',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => $post_type_slug,
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-description' => $post_type_description,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -268,7 +291,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_slug = rand_str( 12 );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_description = '';
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_type_slug, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_type_slug,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'has_archive' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => $post_type_slug,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -276,7 +300,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"> $post_type_archive_item_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type_archive',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => $post_type_slug,
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-status' => 'publish',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,7 +322,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_slug = rand_str( 12 );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_description = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_type_slug, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_type_slug,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'has_archive' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => $post_type_description,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,7 +334,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_description = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_archive_item_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type_archive',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => $post_type_slug,
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-description' => $menu_item_description,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -328,7 +357,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_slug = rand_str( 12 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_archive_item_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type_archive',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => $post_type_slug,
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-status' => 'publish',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -350,7 +381,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"> $menu_item_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $post_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -373,7 +406,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id4 = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_insert = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $post_id1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -382,7 +417,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"> $post_inser2 = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $post_id2,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -391,7 +428,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"> $post_insert3 = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-parent-id' => $post_insert,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -401,7 +440,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"> $post_insert4 = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-parent-id' => $post_insert,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -449,7 +490,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tag_id = self::factory()->tag->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tag_insert = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'post_tag',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $tag_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -540,7 +583,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"> wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $page_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -570,7 +615,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'page_on_front', $page_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $page_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -611,7 +658,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'page_on_front', $new_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'post_tag',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $new_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -689,7 +738,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_parent_ancestor_for_post_archive() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'books', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'books',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => 'Books',
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'has_archive' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -710,7 +760,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"> $first_menu_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $first_page_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -719,7 +771,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"> $second_menu_id = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $second_page_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -729,7 +783,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"> wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type_archive',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'books',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-status' => 'publish',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -782,7 +838,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_iri_current_menu_item( $custom_link, $current = true ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'custom',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-url' => $custom_link,
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/post/output.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> shortcode_atts(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'class' => 'graf',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $atts
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $atts
</ins><span class="cx" style="display: 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 "<p class='$class'>$content</p>\n";
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/post/query.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,31 +179,41 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $att_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $att_ids[1] = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $file, $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $file,
+ $post_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_order' => rand( 1, 100 ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $att_ids[2] = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $file, $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $file,
+ $post_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_order' => rand( 1, 100 ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $att_ids[3] = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $file, $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $file,
+ $post_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_order' => rand( 1, 100 ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $att_ids[4] = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $file, $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $file,
+ $post_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_order' => rand( 1, 100 ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $att_ids[5] = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $file, $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $file,
+ $post_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_order' => rand( 1, 100 ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/post/revisions.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,7 +322,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_revision_view_caps_cpt() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->post_type, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->post_type,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'capability_type' => 'event',
</span><span class="cx" style="display: block; padding: 0 10px"> 'map_meta_cap' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'supports' => array( 'revisions' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -363,7 +364,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_revision_restore_caps_cpt() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->post_type, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->post_type,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'capability_type' => 'event',
</span><span class="cx" style="display: block; padding: 0 10px"> 'map_meta_cap' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'supports' => array( 'revisions' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -408,7 +410,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_revision_restore_caps_before_publish() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->post_type, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->post_type,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'capability_type' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'capabilities' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> // No one can edit this post type once published.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -467,7 +470,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_revision_diff_caps_cpt() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->post_type, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->post_type,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'capability_type' => 'event',
</span><span class="cx" style="display: block; padding: 0 10px"> 'map_meta_cap' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'supports' => array( 'revisions' ),
</span></span></pre></div>
<a id="trunktestsphpunittestspostthumbnailsphp"></a>
<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/thumbnails.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/thumbnails.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/post/thumbnails.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> self::$attachment_id = $factory->attachment->create_upload_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $file, self::$post->ID, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $file,
+ self::$post->ID,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +96,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image.jpg', $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image.jpg',
+ $post_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => $caption,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,7 +116,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_the_post_thumbnail_caption_empty() {
</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"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image.jpg', $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image.jpg',
+ $post_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +138,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image.jpg', $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image.jpg',
+ $post_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => $caption,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,7 +159,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> set_post_thumbnail( self::$post, self::$attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = wp_get_attachment_image(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$attachment_id, 'post-thumbnail', false, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$attachment_id,
+ 'post-thumbnail',
+ false,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'class' => 'attachment-post-thumbnail size-post-thumbnail wp-post-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">@@ -176,7 +187,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> set_post_thumbnail( self::$post, self::$attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = wp_get_attachment_image(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$attachment_id, 'post-thumbnail', false, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$attachment_id,
+ 'post-thumbnail',
+ false,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'class' => 'attachment-post-thumbnail size-post-thumbnail wp-post-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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/post/types.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -298,7 +298,8 @@
</span><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"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'query_var' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -318,7 +319,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_rewrite;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'query_var' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,7 +345,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_rewrite;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'has_archive' => true,
</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,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $post_type_meta_caps;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability_type' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'map_meta_cap' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -386,7 +390,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $_wp_post_type_features;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'supports' => array( 'editor', 'author', 'title' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -411,7 +416,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_taxonomies;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomies' => array( 'category', 'post_tag' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -432,7 +438,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_filter;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => 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">@@ -450,7 +457,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_filter;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'register_meta_box_cb' => '__return_empty_string',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -469,7 +477,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_post_types;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => 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">@@ -488,7 +497,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_post_type_does_not_exist_after_unregister_post_type() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => 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="trunktestsphpunittestspostwpInsertPostphp"></a>
<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/wpInsertPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/wpInsertPost.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/post/wpInsertPost.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,12 +12,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> static function wpSetUpBeforeClass( $factory ) {
</span><span class="cx" style="display: block; padding: 0 10px"> self::$user_ids = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'administrator' => $factory->user->create( array(
- 'role' => 'administrator',
- ) ),
- 'contributor' => $factory->user->create( array(
- 'role' => 'contributor',
- ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'administrator' => $factory->user->create(
+ array(
+ 'role' => 'administrator',
+ )
+ ),
+ 'contributor' => $factory->user->create(
+ array(
+ 'role' => 'contributor',
+ )
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $role = get_role( 'administrator' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,20 +40,29 @@
</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">- register_post_type( 'mapped_meta_caps', array(
- 'capability_type' => array( 'mapped_meta_cap', 'mapped_meta_caps' ),
- 'map_meta_cap' => true,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_post_type(
+ 'mapped_meta_caps',
+ array(
+ 'capability_type' => array( 'mapped_meta_cap', 'mapped_meta_caps' ),
+ 'map_meta_cap' => 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">- register_post_type( 'unmapped_meta_caps', array(
- 'capability_type' => array( 'unmapped_meta_cap', 'unmapped_meta_caps' ),
- 'map_meta_cap' => false,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_post_type(
+ 'unmapped_meta_caps',
+ array(
+ 'capability_type' => array( 'unmapped_meta_cap', 'unmapped_meta_caps' ),
+ 'map_meta_cap' => false,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- register_post_type( 'no_admin_caps', array(
- 'capability_type' => array( 'no_admin_cap', 'no_admin_caps' ),
- 'map_meta_cap' => false,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_post_type(
+ 'no_admin_caps',
+ array(
+ 'capability_type' => array( 'no_admin_cap', 'no_admin_caps' ),
+ 'map_meta_cap' => false,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,28 +192,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_contributor_cannot_set_post_slug( $post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$user_ids['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">- $post_id = $this->factory()->post->create( array(
- 'post_title' => 'Jefferson claim: nice to have Washington on your side.',
- 'post_content' => "I’m in the cabinet. I am complicit in watching him grabbin’ at power and kiss it.\n\nIf Washington isn’t gon’ listen to disciplined dissidents, this is the difference: this kid is out!",
- 'post_type' => $post_type,
- 'post_name' => 'new-washington',
- 'post_status' => 'pending',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = $this->factory()->post->create(
+ array(
+ 'post_title' => 'Jefferson claim: nice to have Washington on your side.',
+ 'post_content' => "I’m in the cabinet. I am complicit in watching him grabbin’ at power and kiss it.\n\nIf Washington isn’t gon’ listen to disciplined dissidents, this is the difference: this kid is out!",
+ 'post_type' => $post_type,
+ 'post_name' => 'new-washington',
+ 'post_status' => 'pending',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actual = get_post_field( 'post_name', $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actual = get_post_field( 'post_name', $post_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Now update the post.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_update_post( array(
- 'ID' => $post_id,
- 'post_title' => 'Hamilton has Washington on side: Jefferson',
- 'post_name' => 'edited-washington',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_post(
+ array(
+ 'ID' => $post_id,
+ 'post_title' => 'Hamilton has Washington on side: Jefferson',
+ 'post_name' => 'edited-washington',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actual = get_post_field( 'post_name', $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actual = get_post_field( 'post_name', $post_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,28 +231,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_administrator_can_set_post_slug( $post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$user_ids['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">- $post_id = $this->factory()->post->create( array(
- 'post_title' => 'What is the Conner Project?',
- 'post_content' => "Evan Hansen’s last link to his friend Conner is a signature on his broken arm.",
- 'post_type' => $post_type,
- 'post_name' => 'dear-evan-hansen-explainer',
- 'post_status' => 'pending',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = $this->factory()->post->create(
+ array(
+ 'post_title' => 'What is the Conner Project?',
+ 'post_content' => 'Evan Hansen’s last link to his friend Conner is a signature on his broken arm.',
+ 'post_type' => $post_type,
+ 'post_name' => 'dear-evan-hansen-explainer',
+ 'post_status' => 'pending',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = 'dear-evan-hansen-explainer';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actual = get_post_field( 'post_name', $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actual = get_post_field( 'post_name', $post_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Now update the post.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_update_post( array(
- 'ID' => $post_id,
- 'post_title' => 'Conner Project to close',
- 'post_name' => 'dear-evan-hansen-spoiler',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_post(
+ array(
+ 'ID' => $post_id,
+ 'post_title' => 'Conner Project to close',
+ 'post_name' => 'dear-evan-hansen-spoiler',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = 'dear-evan-hansen-spoiler';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actual = get_post_field( 'post_name', $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actual = get_post_field( 'post_name', $post_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,28 +272,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_administrator_cannot_set_post_slug_on_post_type_they_cannot_publish() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$user_ids['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">- $post_id = $this->factory()->post->create( array(
- 'post_title' => 'Everything is legal in New Jersey',
- 'post_content' => 'Shortly before his death, Philip Hamilton was heard to claim everything was legal in the garden state.',
- 'post_type' => 'no_admin_caps',
- 'post_name' => 'yet-another-duel',
- 'post_status' => 'pending',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = $this->factory()->post->create(
+ array(
+ 'post_title' => 'Everything is legal in New Jersey',
+ 'post_content' => 'Shortly before his death, Philip Hamilton was heard to claim everything was legal in the garden state.',
+ 'post_type' => 'no_admin_caps',
+ 'post_name' => 'yet-another-duel',
+ 'post_status' => 'pending',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actual = get_post_field( 'post_name', $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actual = get_post_field( 'post_name', $post_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Now update the post.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_update_post( array(
- 'ID' => $post_id,
- 'post_title' => 'Ten things illegal in New Jersey',
- 'post_name' => 'foreshadowing-in-nj',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_post(
+ array(
+ 'ID' => $post_id,
+ 'post_title' => 'Ten things illegal in New Jersey',
+ 'post_name' => 'foreshadowing-in-nj',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actual = get_post_field( 'post_name', $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actual = get_post_field( 'post_name', $post_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestspostwpPostphp"></a>
<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/wpPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/wpPost.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/post/wpPost.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Ensure that there is a post with ID 1.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! get_post( 1 ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->posts, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->posts,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'ID' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Post 1',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunktestsphpunittestspostwpPostTypephp"></a>
<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/wpPostType.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/wpPostType.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/post/wpPostType.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'editor' => true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $post_type_supports
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $post_type_supports
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array(), $post_type_supports_after );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +35,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_supports_custom() {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = 'cpt';
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_object = new WP_Post_Type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_type, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_type,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'supports' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'editor',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comments',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +56,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'editor' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comments' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'revisions' => true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $post_type_supports
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $post_type_supports
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array(), $post_type_supports_after );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +70,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = 'cpt';
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_object = new WP_Post_Type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_type, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_type,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'rewrite' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'query_var' => 'foobar',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,7 +89,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = 'cpt';
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_object = new WP_Post_Type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_type, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_type,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'rewrite' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'query_var' => 'foobar',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +115,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = 'cpt';
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_object = new WP_Post_Type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_type, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_type,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'rewrite' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/post.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self::$editor_id = $factory->user->create( array( 'role' => 'editor' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_role(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'grammarian', 'Grammarian', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'grammarian',
+ 'Grammarian',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'read' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit_posts' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit_others_posts' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -813,7 +815,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = rand_str( 20 );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( $post_type );
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 3, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 3,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => $post_type,
</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"> )
</span></span></pre></div>
<a id="trunktestsphpunittestsprivacywpPrivacySendRequestConfirmationNotificationphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/privacy/wpPrivacySendRequestConfirmationNotification.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/privacy/wpPrivacySendRequestConfirmationNotification.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/privacy/wpPrivacySendRequestConfirmationNotification.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,9 +53,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 43967
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_function_should_not_send_email_when_not_a_wp_user_request() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
- 'post_type' => 'post',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = $this->factory->post->create(
+ array(
+ 'post_type' => 'post',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _wp_privacy_send_request_confirmation_notification( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $mailer = tests_retrieve_phpmailer_instance();
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/query/conditionals.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -800,7 +800,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cpt_name = 'ptawtq';
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cpt_name, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cpt_name,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomies' => array( 'post_tag', 'category' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'rewrite' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'has_archive' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -828,7 +829,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function pre_get_posts_with_tax_query( &$query ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term_by( 'slug', 'tag-slug', 'post_tag' );
</span><span class="cx" style="display: block; padding: 0 10px"> $query->set(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'tax_query', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'tax_query',
+ array(
</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"> 'field' => 'term_id',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -843,7 +845,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cpt_name = 'thearray';
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cpt_name, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cpt_name,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomies' => array( 'post_tag', 'category' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'rewrite' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'has_archive' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -894,7 +897,8 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_type, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_type,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'rewrite' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'has_archive' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -999,7 +1003,9 @@
</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><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image.jpg', $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image.jpg',
+ $post_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span 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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/query/date.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function _get_query_result( $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'any', // For the future post
</span><span class="cx" style="display: block; padding: 0 10px"> 'posts_per_page' => '-1', // To make sure results are accurate
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'ID', // Same order they were created
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/query/dateQuery.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function _get_query_result( $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'any', // For the future post
</span><span class="cx" style="display: block; padding: 0 10px"> 'posts_per_page' => '-1', // To make sure results are accurate
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'ID', // Same order they were created
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/query/isTerm.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -186,7 +186,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function pre_get_posts_tax_category_tax_query( &$query ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $query->set(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'tax_query', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'tax_query',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'testtax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'field' => 'term_id',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/query/metaQuery.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1867,7 +1867,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'key' => 'aa_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">- 'fields' => 'ids',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'fields' => 'ids',
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1915,7 +1915,7 @@
</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">- 'fields' => 'ids',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'fields' => 'ids',
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsquerypostStatusphp"></a>
<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/postStatus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/postStatus.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/query/postStatus.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,7 +197,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_protected_should_be_included_when_in_the_admin() {
</span><span class="cx" style="display: block; padding: 0 10px"> set_current_screen( 'dashboard' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'protected' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_in_admin_all_list' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -264,7 +265,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_single_post_with_nonpublic_and_protected_status_should_not_be_shown_for_user_who_cannot_edit_others_posts() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'foo_pt' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo_ps', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo_ps',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'protected' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -290,7 +292,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_single_post_with_nonpublic_and_protected_status_should_be_shown_for_user_who_can_edit_others_posts() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'foo_pt' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo_ps', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo_ps',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'protected' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -316,7 +319,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_single_post_with_nonpublic_and_private_status_should_not_be_shown_for_user_who_cannot_edit_others_posts() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'foo_pt' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo_ps', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo_ps',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'private' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,7 +346,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_single_post_with_nonpublic_and_private_status_should_be_shown_for_user_who_can_edit_others_posts() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'foo_pt' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo_ps', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo_ps',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'private' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/query/results.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -527,7 +527,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'child-one',
</span><span class="cx" style="display: block; padding: 0 10px"> 'child-two',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), wp_list_pluck( $posts, 'post_title' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ wp_list_pluck( $posts, 'post_title' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Second parent's children
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -543,7 +544,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'child-three',
</span><span class="cx" style="display: block; padding: 0 10px"> 'child-four',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), wp_list_pluck( $posts, 'post_title' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ wp_list_pluck( $posts, 'post_title' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Both first and second parent's children
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -561,7 +563,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'child-two',
</span><span class="cx" style="display: block; padding: 0 10px"> 'child-three',
</span><span class="cx" style="display: block; padding: 0 10px"> 'child-four',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), wp_list_pluck( $posts, 'post_title' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ wp_list_pluck( $posts, 'post_title' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Third parent's children
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -592,7 +595,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'child-four',
</span><span class="cx" style="display: block; padding: 0 10px"> 'child-one',
</span><span class="cx" style="display: block; padding: 0 10px"> 'child-two',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), wp_list_pluck( $posts, 'post_title' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ wp_list_pluck( $posts, 'post_title' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1063,7 +1067,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If both arguments are passed, only post_password is considered.
</span><span class="cx" style="display: block; padding: 0 10px"> $result4 = $this->q->query(
</span><span class="cx" style="display: block; padding: 0 10px"> array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'has_password' => true,
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1072,7 +1077,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( $one ), $result4 );
</span><span class="cx" style="display: block; padding: 0 10px"> $result5 = $this->q->query(
</span><span class="cx" style="display: block; padding: 0 10px"> array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'has_password' => false,
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1081,7 +1087,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( $one ), $result5 );
</span><span class="cx" style="display: block; padding: 0 10px"> $result6 = $this->q->query(
</span><span class="cx" style="display: block; padding: 0 10px"> array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'has_password' => null,
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1091,7 +1098,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result7 = $this->q->query(
</span><span class="cx" style="display: block; padding: 0 10px"> array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'has_password' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_password' => 'burrito',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1100,7 +1108,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( $two, $three ), $result7 );
</span><span class="cx" style="display: block; padding: 0 10px"> $result8 = $this->q->query(
</span><span class="cx" style="display: block; padding: 0 10px"> array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'has_password' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_password' => 'burrito',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1109,7 +1118,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( $two, $three ), $result8 );
</span><span class="cx" style="display: block; padding: 0 10px"> $result9 = $this->q->query(
</span><span class="cx" style="display: block; padding: 0 10px"> array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'has_password' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_password' => 'burrito',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/query/search.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -613,7 +613,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> apply_filters(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'posts_clauses', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'posts_clauses',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'where' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'groupby' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'join' => '',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/query/taxQuery.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1214,7 +1214,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"> $image_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image.jpg', 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image.jpg',
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryvarsphp"></a>
<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/vars.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/vars.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/query/vars.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_format',
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_route',
</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->public_query_vars, 'Care should be taken when introducing new public query vars. See https://core.trac.wordpress.org/ticket/35115'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $wp->public_query_vars,
+ 'Care should be taken when introducing new public query vars. See https://core.trac.wordpress.org/ticket/35115'
</ins><span class="cx" style="display: block; 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="trunktestsphpunittestsqueryphp"></a>
<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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/query.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,7 +95,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'pre_get_posts', array( $this, 'pre_get_posts_tax_category_tax_query' ) );
</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"> $terms = self::factory()->term->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_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">@@ -181,7 +182,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cat' => $c1,
</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"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $url );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,7 +226,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cat' => implode( ',', array( $c1, $c2 ) ),
</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"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $url );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,7 +273,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cat' => array( $c1, $c2 ),
</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"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $url );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,7 +310,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'tag' => $t1->slug,
</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"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $url );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -349,7 +354,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'tag' => implode( ',', array( $c1->slug, $c2->slug ) ),
</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"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $url );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -395,7 +401,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'tag' => array( $c1->slug, $c2->slug ),
</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"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $url );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -423,7 +430,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'test_tax_cat' => 'test1',
</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"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $url );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,7 +459,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'test_tax_cat' => 'test1,test2',
</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"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $url );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -482,7 +491,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'test_tax_cat' => array( 'test1', 'test2' ),
</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"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $url );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -519,7 +529,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_rewrite;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'guide', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'guide',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Guide',
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> $this->assertEquals( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] );
</span><span class="cx" style="display: block; padding: 0 10px"> // Single
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,7 +174,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'search',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug',
</span><span class="cx" style="display: block; padding: 0 10px"> 'status',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $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"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $media_types = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'application',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +191,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_registered_get_item_params() {
</span><span class="cx" style="display: block; padding: 0 10px"> $id1 = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,7 +209,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_items() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> $id1 = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,7 +218,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $draft_post = $this->factory->post->create( array( 'post_status' => 'draft' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $id2 = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, $draft_post, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ $draft_post,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,7 +227,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $published_post = $this->factory->post->create( array( 'post_status' => 'publish' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $id3 = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, $published_post, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ $published_post,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,7 +249,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_items_logged_in_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"> $id1 = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,7 +258,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $draft_post = $this->factory->post->create( array( 'post_status' => 'draft' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $id2 = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, $draft_post, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ $draft_post,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,7 +267,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $published_post = $this->factory->post->create( array( 'post_status' => 'publish' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $id3 = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, $published_post, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ $published_post,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,7 +287,9 @@
</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_media_type() {
</span><span class="cx" style="display: block; padding: 0 10px"> $id1 = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 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,7 +310,9 @@
</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_mime_type() {
</span><span class="cx" style="display: block; padding: 0 10px"> $id1 = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,13 +334,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_items_parent() {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $this->factory->post->create( array( 'post_title' => 'Test Post' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ $post_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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><span class="cx" style="display: block; padding: 0 10px"> $attachment_id2 = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,7 +378,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_items_invalid_status_param_is_error_response() {
</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"> $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -371,7 +398,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Logged out users can't make the request
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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"> 'post_status' => 'private',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -393,7 +422,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Logged out users can't make the request
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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"> 'post_status' => 'private',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -400,7 +431,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"> $attachment_id2 = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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"> 'post_status' => 'trash',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -434,7 +467,9 @@
</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_valid_date() {
</span><span class="cx" style="display: block; padding: 0 10px"> $id1 = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2016-01-15T00:00:00Z',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => 'A sample caption',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -441,7 +476,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"> $id2 = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2016-01-16T00:00:00Z',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => 'A sample caption',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -448,7 +485,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"> $id3 = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2016-01-17T00:00:00Z',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => 'A sample caption',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -465,7 +504,9 @@
</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() {
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -480,10 +521,13 @@
</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_sizes() {
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => 'A sample caption',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $this->test_file
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $this->test_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"> add_image_size( 'rest-api-test', 119, 119, true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -504,10 +548,13 @@
</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_sizes_with_no_url() {
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => 'A sample caption',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $this->test_file
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $this->test_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"> add_image_size( 'rest-api-test', 119, 119, true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -528,7 +575,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> $draft_post = $this->factory->post->create( array( 'post_status' => 'draft' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $id1 = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, $draft_post, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ $draft_post,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -540,7 +589,9 @@
</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_inherit_status_with_invalid_parent() {
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, REST_TESTS_IMPOSSIBLY_HIGH_NUMBER, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ REST_TESTS_IMPOSSIBLY_HIGH_NUMBER,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -555,7 +606,9 @@
</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_auto_status_with_invalid_parent_not_authenticated_returns_error() {
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, REST_TESTS_IMPOSSIBLY_HIGH_NUMBER, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ REST_TESTS_IMPOSSIBLY_HIGH_NUMBER,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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"> 'post_status' => 'auto-draft',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -790,7 +843,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_update_item() {
</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"> $attachment_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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"> 'post_author' => self::$editor_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -818,7 +873,9 @@
</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"> $original_parent = $this->factory->post->create( array() );
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, $original_parent, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ $original_parent,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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"> 'post_author' => $this->editor_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -840,7 +897,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_update_item_invalid_permissions() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$author_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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"> 'post_author' => self::$editor_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -862,7 +921,9 @@
</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::$editor_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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"> 'post_author' => self::$editor_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1059,7 +1120,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'caption' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'raw' => 'div <strong>strong</strong> oh noes',
</span><span class="cx" style="display: block; padding: 0 10px"> 'rendered' => 'div <strong>strong</strong> oh noes',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1081,7 +1143,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'caption' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'raw' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'rendered' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1107,7 +1170,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'caption' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'raw' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'rendered' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1127,7 +1191,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_delete_item() {
</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"> $attachment_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1141,7 +1207,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_delete_item_no_trash() {
</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"> $attachment_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1164,7 +1232,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_delete_item_invalid_delete_permissions() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$author_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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"> 'post_author' => self::$editor_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1177,7 +1247,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_prepare_item() {
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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"> 'post_author' => self::$editor_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1194,7 +1266,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_prepare_item_limit_fields() {
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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"> 'post_author' => self::$editor_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1207,10 +1281,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( '_fields', 'id,slug' );
</span><span class="cx" style="display: block; padding: 0 10px"> $obj = get_post( $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $endpoint->prepare_item_for_response( $obj, $request );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array(
- 'id',
- 'slug',
- ), array_keys( $response->get_data() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals(
+ array(
+ 'id',
+ 'slug',
+ ),
+ array_keys( $response->get_data() )
+ );
</ins><span class="cx" style="display: 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_item_schema() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1261,7 +1338,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"> register_rest_field(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'attachment', 'my_custom_int', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'attachment',
+ 'my_custom_int',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'schema' => $schema,
</span><span class="cx" style="display: block; padding: 0 10px"> 'get_callback' => array( $this, 'additional_field_get_callback' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1275,7 +1354,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $schema, $data['schema']['properties']['my_custom_int'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1299,7 +1380,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"> register_rest_field(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'attachment', 'my_custom_int', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'attachment',
+ 'my_custom_int',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'schema' => $schema,
</span><span class="cx" style="display: block; padding: 0 10px"> 'get_callback' => array( $this, 'additional_field_get_callback' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'update_callback' => array( $this, 'additional_field_update_callback' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1308,7 +1391,9 @@
</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::$editor_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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"> 'post_author' => self::$editor_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1332,12 +1417,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_search_item_by_filename() {
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $id2 = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file2, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file2,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/png',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rest-api/rest-categories-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,31 +41,51 @@
</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">- register_meta( 'term', 'test_single', array(
- 'show_in_rest' => true,
- 'single' => true,
- 'type' => 'string',
- ));
- register_meta( 'term', 'test_multi', array(
- 'show_in_rest' => true,
- 'single' => false,
- 'type' => 'string',
- ));
- register_term_meta( 'category', 'test_cat_single', array(
- 'show_in_rest' => true,
- 'single' => true,
- 'type' => 'string',
- ));
- register_term_meta( 'category', 'test_cat_multi', array(
- 'show_in_rest' => true,
- 'single' => false,
- 'type' => 'string',
- ));
- register_term_meta( 'post_tag', 'test_tag_meta', array(
- 'show_in_rest' => true,
- 'single' => true,
- 'type' => 'string',
- ));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_meta(
+ 'term',
+ 'test_single',
+ array(
+ 'show_in_rest' => true,
+ 'single' => true,
+ 'type' => 'string',
+ )
+ );
+ register_meta(
+ 'term',
+ 'test_multi',
+ array(
+ 'show_in_rest' => true,
+ 'single' => false,
+ 'type' => 'string',
+ )
+ );
+ register_term_meta(
+ 'category',
+ 'test_cat_single',
+ array(
+ 'show_in_rest' => true,
+ 'single' => true,
+ 'type' => 'string',
+ )
+ );
+ register_term_meta(
+ 'category',
+ 'test_cat_multi',
+ array(
+ 'show_in_rest' => true,
+ 'single' => false,
+ 'type' => 'string',
+ )
+ );
+ register_term_meta(
+ 'post_tag',
+ 'test_tag_meta',
+ array(
+ 'show_in_rest' => true,
+ 'single' => true,
+ 'type' => '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"> public function test_register_routes() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +130,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'search',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug',
</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"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -570,7 +591,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $next_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( 'wp/v2/categories' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( 'wp/v2/categories' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( stripos( $headers['Link'], 'rel="prev"' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -590,13 +612,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( 'wp/v2/categories' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( 'wp/v2/categories' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $next_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 4,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( 'wp/v2/categories' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( 'wp/v2/categories' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
</span><span class="cx" style="display: block; padding: 0 10px"> // Last page
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -610,7 +634,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 5,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( 'wp/v2/categories' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( 'wp/v2/categories' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( stripos( $headers['Link'], 'rel="next"' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -625,7 +650,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 6,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( 'wp/v2/categories' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( 'wp/v2/categories' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( stripos( $headers['Link'], 'rel="next"' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -684,7 +710,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_item_meta_registered_for_different_taxonomy() {
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', '/wp/v2/categories/1' );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = rest_get_server()->dispatch( $request );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data = $response->get_data();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data = $response->get_data();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'meta', $data );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'meta', $data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -840,11 +866,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'name', 'New Name' );
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'description', 'New Description' );
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'slug', 'new-slug' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $request->set_param( 'meta', array(
- 'test_single' => 'just meta',
- 'test_cat_single' => 'category-specific meta',
- 'test_tag_meta' => 'tag-specific meta',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request->set_param(
+ 'meta',
+ array(
+ 'test_single' => 'just meta',
+ 'test_cat_single' => 'category-specific meta',
+ 'test_tag_meta' => 'tag-specific meta',
+ )
+ );
</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"> $data = $response->get_data();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -968,10 +997,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( '_fields', 'id,name' );
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( 1, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $endpoint->prepare_item_for_response( $term, $request );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array(
- 'id',
- 'name',
- ), array_keys( $response->get_data() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals(
+ array(
+ 'id',
+ 'name',
+ ),
+ array_keys( $response->get_data() )
+ );
</ins><span class="cx" style="display: 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_prepare_taxonomy_term_child() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1022,7 +1054,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"> register_rest_field(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'category', 'my_custom_int', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'category',
+ 'my_custom_int',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'schema' => $schema,
</span><span class="cx" style="display: block; padding: 0 10px"> 'get_callback' => array( $this, 'additional_field_get_callback' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rest-api/rest-comments-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,7 +173,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'search',
</span><span class="cx" style="display: block; padding: 0 10px"> 'status',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type',
</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"> );
</span><span class="cx" style="display: block; padding: 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 +726,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $next_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( '/wp/v2/comments' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( '/wp/v2/comments' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( stripos( $headers['Link'], 'rel="prev"' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -745,13 +747,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( '/wp/v2/comments' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( '/wp/v2/comments' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $next_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 4,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( '/wp/v2/comments' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( '/wp/v2/comments' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
</span><span class="cx" style="display: block; padding: 0 10px"> // Last page
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -764,7 +768,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 5,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( '/wp/v2/comments' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( '/wp/v2/comments' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( stripos( $headers['Link'], 'rel="next"' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -778,7 +783,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 6,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( '/wp/v2/comments' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( '/wp/v2/comments' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( stripos( $headers['Link'], 'rel="next"' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -855,10 +861,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( '_fields', 'id,status' );
</span><span class="cx" style="display: block; padding: 0 10px"> $obj = get_comment( self::$approved_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $endpoint->prepare_item_for_response( $obj, $request );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array(
- 'id',
- 'status',
- ), array_keys( $response->get_data() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals(
+ array(
+ 'id',
+ 'status',
+ ),
+ array_keys( $response->get_data() )
+ );
</ins><span class="cx" style="display: 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_comment_author_avatar_urls() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2665,7 +2674,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' => '\o/ ¯\_(ツ)_/¯',
</span><span class="cx" style="display: block; padding: 0 10px"> 'author_name' => '\o/ ¯\_(ツ)_/¯',
</span><span class="cx" style="display: block; padding: 0 10px"> 'author_user_agent' => '\o/ ¯\_(ツ)_/¯',
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'content' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'raw' => '\o/ ¯\_(ツ)_/¯',
</span><span class="cx" style="display: block; padding: 0 10px"> 'rendered' => '<p>\o/ ¯\_(ツ)_/¯</p>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2685,7 +2695,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'author_name' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'author_user_agent' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'content' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'raw' => 'div <strong>strong</strong> oh noes',
</span><span class="cx" style="display: block; padding: 0 10px"> 'rendered' => '<p>div <strong>strong</strong> oh noes</p>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2701,7 +2712,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'author_name' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'author_user_agent' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'content' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'raw' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'rendered' => "<div>div</div>\n<p> <strong>strong</strong> <script>oh noes</script></p>",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2721,7 +2733,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' => '\\\&\\\ & &invalid; < < &lt;',
</span><span class="cx" style="display: block; padding: 0 10px"> 'author_name' => '\\\&\\\ & &invalid; < < &lt;',
</span><span class="cx" style="display: block; padding: 0 10px"> 'author_user_agent' => '\\\&\\\ & &invalid; < < &lt;',
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'content' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'raw' => '\\\&\\\ & &invalid; < < &lt;',
</span><span class="cx" style="display: block; padding: 0 10px"> 'rendered' => '<p>\\\&\\\ & &invalid; < < &lt;' . "\n</p>",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2740,7 +2753,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'author_name' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'author_user_agent' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'content' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'raw' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'rendered' => "<div>div</div>\n<p> <strong>strong</strong> <script>oh noes</script></p>",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2908,7 +2922,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"> register_rest_field(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'comment', 'my_custom_int', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'comment',
+ 'my_custom_int',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'schema' => $schema,
</span><span class="cx" style="display: block; padding: 0 10px"> 'get_callback' => array( $this, 'additional_field_get_callback' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'update_callback' => array( $this, 'additional_field_update_callback' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2967,7 +2983,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"> register_rest_field(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'comment', 'my_custom_int', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'comment',
+ 'my_custom_int',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'schema' => $schema,
</span><span class="cx" style="display: block; padding: 0 10px"> 'get_callback' => array( $this, 'additional_field_get_callback' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'update_callback' => array( $this, 'additional_field_update_callback' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3023,7 +3041,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'self',
</span><span class="cx" style="display: block; padding: 0 10px"> 'collection',
</span><span class="cx" style="display: block; padding: 0 10px"> 'up',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), array_keys( $links )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array_keys( $links )
</ins><span class="cx" style="display: 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' === $context ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestcontrollerphp"></a>
<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-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-controller.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rest-api/rest-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,9 @@
</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"> $this->request = new WP_REST_Request(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'GET', '/wp/v2/testroute', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'GET',
+ '/wp/v2/testroute',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'someinteger' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'integer',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,22 +207,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $controller = new WP_REST_Test_Controller();
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', '/wp/v2/testroute' );
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = $controller->get_fields_for_response( $request );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array(
- 'somestring',
- 'someinteger',
- 'someboolean',
- 'someurl',
- 'somedate',
- 'someemail',
- 'someenum',
- 'someargoptions',
- 'somedefault',
- ), $fields );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals(
+ array(
+ 'somestring',
+ 'someinteger',
+ 'someboolean',
+ 'someurl',
+ 'somedate',
+ 'someemail',
+ 'someenum',
+ 'someargoptions',
+ 'somedefault',
+ ),
+ $fields
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( '_fields', 'somestring,someinteger' );
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = $controller->get_fields_for_response( $request );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array(
- 'somestring',
- 'someinteger',
- ), $fields );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals(
+ array(
+ 'somestring',
+ 'someinteger',
+ ),
+ $fields
+ );
</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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rest-api/rest-pages-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,7 +86,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'search',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug',
</span><span class="cx" style="display: block; padding: 0 10px"> 'status',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $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"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -465,15 +466,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( '_fields', 'id,slug' );
</span><span class="cx" style="display: block; padding: 0 10px"> $obj = get_post( $page_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $endpoint->prepare_item_for_response( $obj, $request );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array(
- 'id',
- 'slug',
- ), array_keys( $response->get_data() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals(
+ array(
+ 'id',
+ 'slug',
+ ),
+ array_keys( $response->get_data() )
+ );
</ins><span class="cx" style="display: 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_pages_params() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->factory->post->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 8, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 8,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rest-api/rest-post-meta-fields.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,10 +15,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $cpt_post_id;
</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">- register_post_type( 'cpt', array(
- 'show_in_rest' => true,
- 'supports' => array( 'custom-fields' ),
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_post_type(
+ 'cpt',
+ array(
+ 'show_in_rest' => true,
+ 'supports' => array( 'custom-fields' ),
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> self::$wp_meta_keys_saved = isset( $GLOBALS['wp_meta_keys'] ) ? $GLOBALS['wp_meta_keys'] : array();
</span><span class="cx" style="display: block; padding: 0 10px"> self::$post_id = $factory->post->create();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +40,9 @@
</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"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post', 'test_single', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post',
+ 'test_single',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +49,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"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post', 'test_multi', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post',
+ 'test_multi',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +58,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"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post', 'test_bad_auth', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post',
+ 'test_bad_auth',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'auth_callback' => '__return_false',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,7 +68,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"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post', 'test_bad_auth_multi', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post',
+ 'test_bad_auth_multi',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'auth_callback' => '__return_false',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,13 +79,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> register_meta( 'post', 'test_no_rest', array() );
</span><span class="cx" style="display: block; padding: 0 10px"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post', 'test_rest_disabled', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post',
+ 'test_rest_disabled',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post', 'test_custom_schema', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post',
+ 'test_custom_schema',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'integer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,7 +100,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"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post', 'test_custom_schema_multi', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post',
+ 'test_custom_schema_multi',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'single' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'integer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +113,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"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post', 'test_invalid_type', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post',
+ 'test_invalid_type',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'lalala',
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +122,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"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post', 'test_no_type', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post',
+ 'test_no_type',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +132,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"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post', 'test_custom_name', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post',
+ 'test_custom_name',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,7 +144,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"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post', 'test_custom_name_multi', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post',
+ 'test_custom_name_multi',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'single' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,27 +155,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">- register_post_type( 'cpt', array(
- 'show_in_rest' => true,
- 'supports' => array( 'custom-fields' ),
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_post_type(
+ 'cpt',
+ array(
+ 'show_in_rest' => true,
+ 'supports' => array( 'custom-fields' ),
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- register_post_meta( 'cpt', 'test_cpt_single', array(
- 'show_in_rest' => true,
- 'single' => true,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_post_meta(
+ 'cpt',
+ 'test_cpt_single',
+ array(
+ 'show_in_rest' => true,
+ 'single' => 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">- register_post_meta( 'cpt', 'test_cpt_multi', array(
- 'show_in_rest' => true,
- 'single' => false,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_post_meta(
+ 'cpt',
+ 'test_cpt_multi',
+ array(
+ 'show_in_rest' => true,
+ 'single' => false,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Register 'test_single' on subtype to override for bad auth.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- register_post_meta( 'cpt', 'test_single', array(
- 'show_in_rest' => true,
- 'single' => true,
- 'auth_callback' => '__return_false',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_post_meta(
+ 'cpt',
+ 'test_single',
+ array(
+ 'show_in_rest' => true,
+ 'single' => true,
+ 'auth_callback' => '__return_false',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** @var WP_REST_Server $wp_rest_server */
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_rest_server;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -258,7 +298,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_value_types() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post', 'test_string', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post',
+ 'test_string',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,7 +307,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"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post', 'test_number', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post',
+ 'test_number',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'number',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,7 +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"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post', 'test_bool', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post',
+ 'test_bool',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'boolean',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -573,7 +619,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_set_value_invalid_value() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post', 'my_meta_key', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post',
+ 'my_meta_key',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -596,7 +644,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_set_value_invalid_value_multiple() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post', 'my_meta_key', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post',
+ 'my_meta_key',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -619,7 +669,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_set_value_sanitized() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post', 'my_meta_key', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post',
+ 'my_meta_key',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'integer',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -643,7 +695,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_set_value_csv() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post', 'my_meta_key', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post',
+ 'my_meta_key',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'integer',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1095,7 +1149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id, $meta_key, $meta_value );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/%s/%d', $endpoint, $post_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/%s/%d', $endpoint, $post_id ) );
</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">
</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">@@ -1148,11 +1202,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->grant_write_permission();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'POST', sprintf( '/wp/v2/%s/%d', $endpoint, $post_id ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $request->set_body_params( array(
- 'meta' => array(
- $meta_key => $meta_value,
- ),
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request->set_body_params(
+ array(
+ 'meta' => array(
+ $meta_key => $meta_value,
+ ),
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</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"> if ( ! $can_write ) {
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rest-api/rest-post-statuses-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,7 +59,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'draft',
</span><span class="cx" style="display: block; padding: 0 10px"> 'trash',
</span><span class="cx" style="display: block; padding: 0 10px"> 'future',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), array_keys( $data )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array_keys( $data )
</ins><span class="cx" style="display: block; 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">@@ -138,10 +139,13 @@
</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"> $request->set_param( '_fields', 'id,name' );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $endpoint->prepare_item_for_response( $obj, $request );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array(
- // 'id' doesn't exist in this context.
- 'name',
- ), array_keys( $response->get_data() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals(
+ array(
+ // 'id' doesn't exist in this context.
+ 'name',
+ ),
+ array_keys( $response->get_data() )
+ );
</ins><span class="cx" style="display: 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_item_schema() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,7 +173,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"> register_rest_field(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'status', 'my_custom_int', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'status',
+ 'my_custom_int',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'schema' => $schema,
</span><span class="cx" style="display: block; padding: 0 10px"> 'get_callback' => array( $this, 'additional_field_get_callback' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'update_callback' => array( $this, 'additional_field_update_callback' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,7 +214,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'archives',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), array_keys( $links )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array_keys( $links )
</ins><span class="cx" style="display: block; 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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rest-api/rest-post-types-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,10 +130,13 @@
</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"> $request->set_param( '_fields', 'id,name' );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $endpoint->prepare_item_for_response( $obj, $request );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array(
- // 'id' doesn't exist in this context.
- 'name',
- ), array_keys( $response->get_data() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals(
+ array(
+ // 'id' doesn't exist in this context.
+ 'name',
+ ),
+ array_keys( $response->get_data() )
+ );
</ins><span class="cx" style="display: 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_item_schema() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,7 +167,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"> register_rest_field(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'type', 'my_custom_int', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'type',
+ 'my_custom_int',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'schema' => $schema,
</span><span class="cx" style="display: block; padding: 0 10px"> 'get_callback' => array( $this, 'additional_field_get_callback' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'update_callback' => array( $this, 'additional_field_update_callback' ),
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,8 @@
</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"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'youseeme', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'youseeme',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'supports' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,7 +162,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'sticky',
</span><span class="cx" style="display: block; padding: 0 10px"> 'tags',
</span><span class="cx" style="display: block; padding: 0 10px"> 'tags_exclude',
</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"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1108,7 +1110,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $next_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( '/wp/v2/posts' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( '/wp/v2/posts' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( stripos( $headers['Link'], 'rel="prev"' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1127,13 +1130,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( '/wp/v2/posts' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( '/wp/v2/posts' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $next_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 4,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( '/wp/v2/posts' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( '/wp/v2/posts' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
</span><span class="cx" style="display: block; padding: 0 10px"> // Last page
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1146,7 +1151,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 5,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( '/wp/v2/posts' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( '/wp/v2/posts' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( stripos( $headers['Link'], 'rel="next"' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1174,7 +1180,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'per_page' => 5,
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 1,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( '/wp/v2/posts' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( '/wp/v2/posts' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $next_link = add_query_arg(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1181,7 +1188,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'per_page' => 5,
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 3,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( '/wp/v2/posts' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( '/wp/v2/posts' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1531,10 +1539,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( '_fields', 'id,slug' );
</span><span class="cx" style="display: block; padding: 0 10px"> $obj = get_post( self::$post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $endpoint->prepare_item_for_response( $obj, $request );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array(
- 'id',
- 'slug',
- ), array_keys( $response->get_data() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals(
+ array(
+ 'id',
+ 'slug',
+ ),
+ array_keys( $response->get_data() )
+ );
</ins><span class="cx" style="display: 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_create_item() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2018,7 +2029,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->attachment_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $file, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $file,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_order' => rand( 1, 100 ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3253,7 +3266,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'excerpt' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'raw' => 'div <strong>strong</strong> oh noes',
</span><span class="cx" style="display: block; padding: 0 10px"> 'rendered' => 'div <strong>strong</strong> oh noes',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3275,7 +3289,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'excerpt' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'raw' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'rendered' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3301,7 +3316,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'excerpt' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'raw' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'rendered' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3387,7 +3403,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_register_post_type_invalid_controller() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'invalid-controller', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'invalid-controller',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_controller_class' => 'Fake_Class_Baba',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3556,7 +3573,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'request-completed',
</span><span class="cx" style="display: block; padding: 0 10px"> 'any',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $status_arg['items']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $status_arg['items']
</ins><span class="cx" style="display: block; 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">@@ -3570,7 +3588,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"> register_rest_field(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post', 'my_custom_int', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post',
+ 'my_custom_int',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'schema' => $schema,
</span><span class="cx" style="display: block; padding: 0 10px"> 'get_callback' => array( $this, 'additional_field_get_callback' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'update_callback' => array( $this, 'additional_field_update_callback' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3629,7 +3649,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"> register_rest_field(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post', 'my_custom_int', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post',
+ 'my_custom_int',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'schema' => $schema,
</span><span class="cx" style="display: block; padding: 0 10px"> 'get_callback' => array( $this, 'additional_field_get_callback' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'update_callback' => array( $this, 'additional_field_update_callback' ),
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestrequestvalidationphp"></a>
<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-request-validation.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-request-validation.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rest-api/rest-request-validation.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_validate_within_min_max_range_inclusive() {
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'GET', '/wp/v2/foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'GET',
+ '/wp/v2/foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'minmaxrange' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'integer',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,7 +37,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_validate_within_min_max_range_min_exclusive() {
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'GET', '/wp/v2/foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'GET',
+ '/wp/v2/foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'minmaxrange' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'integer',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +66,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_validate_within_min_max_range_max_exclusive() {
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'GET', '/wp/v2/foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'GET',
+ '/wp/v2/foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'minmaxrange' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'integer',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +95,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_validate_within_min_max_range_both_exclusive() {
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'GET', '/wp/v2/foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'GET',
+ '/wp/v2/foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'minmaxrange' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'integer',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +125,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_validate_greater_than_min_inclusive() {
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'GET', '/wp/v2/foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'GET',
+ '/wp/v2/foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'greaterthanmin' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'integer',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,7 +144,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_validate_greater_than_min_exclusive() {
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'GET', '/wp/v2/foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'GET',
+ '/wp/v2/foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'greaterthanmin' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'integer',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +166,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_validate_less_than_max_inclusive() {
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'GET', '/wp/v2/foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'GET',
+ '/wp/v2/foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'lessthanmax' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'integer',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +185,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_validate_less_than_max_exclusive() {
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'GET', '/wp/v2/foo', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'GET',
+ '/wp/v2/foo',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'lessthanmax' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'integer',
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestrequestphp"></a>
<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-request.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-request.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rest-api/rest-request.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -609,7 +609,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'bar',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $request->get_query_params()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $request->get_query_params()
</ins><span class="cx" style="display: block; 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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rest-api/rest-revisions-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,10 +245,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( '_fields', 'id,slug' );
</span><span class="cx" style="display: block; padding: 0 10px"> $revision = get_post( $this->revision_id1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $endpoint->prepare_item_for_response( $revision, $request );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array(
- 'id',
- 'slug',
- ), array_keys( $response->get_data() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals(
+ array(
+ 'id',
+ 'slug',
+ ),
+ array_keys( $response->get_data() )
+ );
</ins><span class="cx" style="display: 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_item_schema() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,7 +296,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"> register_rest_field(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post-revision', 'my_custom_int', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post-revision',
+ 'my_custom_int',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'schema' => $schema,
</span><span class="cx" style="display: block; padding: 0 10px"> 'get_callback' => array( $this, 'additional_field_get_callback' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'update_callback' => array( $this, 'additional_field_update_callback' ),
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestschemasanitizationphp"></a>
<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-schema-sanitization.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-schema-sanitization.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rest-api/rest-schema-sanitization.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,11 +144,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"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( '1', '2' ), rest_sanitize_value_from_schema(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( '1', '2' ),
+ rest_sanitize_value_from_schema(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'first' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'second' => '2',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $schema
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $schema
</ins><span class="cx" style="display: block; 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">@@ -168,11 +170,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'a' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'b' => 1,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_sanitize_value_from_schema(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_sanitize_value_from_schema(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'a' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'b' => 1,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $schema
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $schema
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,11 +194,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( 'a' => 1 ), rest_sanitize_value_from_schema( array( 'a' => 1 ), $schema ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( 'a' => 1 ), rest_sanitize_value_from_schema( array( 'a' => '1' ), $schema ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( 'a' => 1 ), rest_sanitize_value_from_schema(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 'a' => 1 ),
+ rest_sanitize_value_from_schema(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'a' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'b' => 1,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $schema
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $schema
</ins><span class="cx" style="display: block; 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="trunktestsphpunittestsrestapirestschemasetupphp"></a>
<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-schema-setup.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-schema-setup.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rest-api/rest-schema-setup.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +189,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"> $media_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '/tmp/canola.jpg', 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '/tmp/canola.jpg',
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</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"> 'post_name' => 'restapi-client-fixture-attachment',
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestschemavalidationphp"></a>
<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-schema-validation.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-schema-validation.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rest-api/rest-schema-validation.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,7 +183,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'first' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'second' => '2',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $schema
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $schema
</ins><span class="cx" style="display: block; 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">@@ -203,7 +204,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'a' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'b' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $schema
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $schema
</ins><span class="cx" style="display: 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->assertWPError( rest_validate_value_from_schema( array( 'a' => 'invalid' ), $schema ) );
</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"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'a' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'b' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $schema
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $schema
</ins><span class="cx" style="display: block; 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">@@ -261,7 +264,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'b' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'c' => 'invalid',
</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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $schema
</ins><span class="cx" style="display: 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->assertWPError( rest_validate_value_from_schema( array( 'a' => 1 ), $schema ) );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rest-api/rest-server.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,7 +63,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_default_param() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test-ns', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test-ns',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => array( 'GET' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,7 +85,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_default_param_is_overridden() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test-ns', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test-ns',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => array( 'GET' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +107,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_optional_param() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'optional', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'optional',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => array( 'GET' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,7 +128,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_no_zero_param() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'no-zero', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'no-zero',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => array( 'GET' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +147,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_head_request_handled_by_get() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'head-request', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'head-request',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => array( 'GET' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_true',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,7 +167,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_explicit_head_callback() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'head-request', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'head-request',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => array( 'HEAD' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_true',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,7 +189,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_url_params_no_numeric_keys() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> rest_get_server()->register_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test', '/test/(?P<data>.*)', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test',
+ '/test/(?P<data>.*)',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => WP_REST_Server::READABLE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_false',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,7 +213,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_rest_route_capability_authorization_fails() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test-ns', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test-ns',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => 'GET',
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><span class="cx" style="display: block; padding: 0 10px"> 'should_exist' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,7 +235,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_rest_route_capability_authorization() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test-ns', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test-ns',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => 'GET',
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><span class="cx" style="display: block; padding: 0 10px"> 'should_exist' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,7 +263,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_allow_header_sent() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test-ns', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test-ns',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => 'GET',
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><span class="cx" style="display: block; padding: 0 10px"> 'should_exist' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,7 +290,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_allow_header_sent_with_multiple_methods() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test-ns', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test-ns',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => 'GET',
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><span class="cx" style="display: block; padding: 0 10px"> 'should_exist' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -278,7 +300,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"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test-ns', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test-ns',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => 'POST',
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><span class="cx" style="display: block; padding: 0 10px"> 'should_exist' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -304,7 +328,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_allow_header_send_only_permitted_methods() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test-ns', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test-ns',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => 'GET',
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><span class="cx" style="display: block; padding: 0 10px"> 'should_exist' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,7 +339,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"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test-ns', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test-ns',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => 'POST',
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><span class="cx" style="display: block; padding: 0 10px"> 'should_exist' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -333,7 +361,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_allow_header_sent_on_options_request() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test-ns', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test-ns',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => array( 'GET' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -468,7 +498,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_link_embedding() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Register our testing route.
</span><span class="cx" style="display: block; padding: 0 10px"> rest_get_server()->register_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test', '/test/embeddable', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test',
+ '/test/embeddable',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => 'GET',
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => array( $this, 'embedded_response_callback' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -541,7 +573,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_link_embedding_self() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Register our testing route.
</span><span class="cx" style="display: block; padding: 0 10px"> rest_get_server()->register_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test', '/test/embeddable', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test',
+ '/test/embeddable',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => 'GET',
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => array( $this, 'embedded_response_callback' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -562,7 +596,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_link_embedding_params() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Register our testing route.
</span><span class="cx" style="display: block; padding: 0 10px"> rest_get_server()->register_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test', '/test/embeddable', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test',
+ '/test/embeddable',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => 'GET',
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => array( $this, 'embedded_response_callback' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -588,7 +624,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_link_embedding_error() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Register our testing route.
</span><span class="cx" style="display: block; padding: 0 10px"> rest_get_server()->register_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test', '/test/embeddable', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test',
+ '/test/embeddable',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => 'GET',
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => array( $this, 'embedded_response_callback' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -683,7 +721,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_index() {
</span><span class="cx" style="display: block; padding: 0 10px"> $server = new WP_REST_Server();
</span><span class="cx" style="display: block; padding: 0 10px"> $server->register_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test/example', '/test/example/some-route', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test/example',
+ '/test/example/some-route',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => WP_REST_Server::READABLE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_true',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -725,7 +765,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_namespace_index() {
</span><span class="cx" style="display: block; padding: 0 10px"> $server = new WP_REST_Server();
</span><span class="cx" style="display: block; padding: 0 10px"> $server->register_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test/example', '/test/example/some-route', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test/example',
+ '/test/example/some-route',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => WP_REST_Server::READABLE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_true',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -737,7 +779,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"> $server->register_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test/another', '/test/another/route', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test/another',
+ '/test/another/route',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => WP_REST_Server::READABLE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_false',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -764,7 +808,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_namespaces() {
</span><span class="cx" style="display: block; padding: 0 10px"> $server = new WP_REST_Server();
</span><span class="cx" style="display: block; padding: 0 10px"> $server->register_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test/example', '/test/example/some-route', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test/example',
+ '/test/example/some-route',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => WP_REST_Server::READABLE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_true',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -772,7 +818,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"> $server->register_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test/another', '/test/another/route', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test/another',
+ '/test/another/route',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => WP_REST_Server::READABLE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_false',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -855,7 +903,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_serve_request_url_params_are_unslashed() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> rest_get_server()->register_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test', '/test/(?P<data>.*)', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test',
+ '/test/(?P<data>.*)',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => WP_REST_Server::READABLE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_false',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -874,7 +924,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_serve_request_query_params_are_unslashed() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> rest_get_server()->register_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => WP_REST_Server::READABLE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_false',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -900,7 +952,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_serve_request_body_params_are_unslashed() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> rest_get_server()->register_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => WP_REST_Server::READABLE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_false',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -927,7 +981,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_serve_request_json_params_are_unslashed() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> rest_get_server()->register_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => WP_REST_Server::READABLE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_false',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -953,7 +1009,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_serve_request_file_params_are_unslashed() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> rest_get_server()->register_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => WP_REST_Server::READABLE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_false',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -979,7 +1037,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_serve_request_headers_are_unslashed() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> rest_get_server()->register_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => WP_REST_Server::READABLE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_false',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1054,7 +1114,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_rest_validate_before_sanitization() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test-ns', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test-ns',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => array( 'GET' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rest-api/rest-settings-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$author = $factory->user->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$author = $factory->user->create(
</ins><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="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,7 +118,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$administrator );
</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">- 'somegroup', 'mycustomsetting', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'somegroup',
+ 'mycustomsetting',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'mycustomsettinginrest',
</span><span class="cx" style="display: block; padding: 0 10px"> 'schema' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,7 +154,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$administrator );
</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">- 'somegroup', 'mycustomsetting', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'somegroup',
+ 'mycustomsetting',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'schema' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'array',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,7 +204,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$administrator );
</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">- 'somegroup', 'mycustomsetting', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'somegroup',
+ 'mycustomsetting',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'schema' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'object',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,7 +241,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Invalid value
</span><span class="cx" style="display: block; padding: 0 10px"> update_option(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mycustomsetting', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mycustomsetting',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'a' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'b' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,7 +269,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'rest_pre_get_setting', array( $this, 'get_setting_custom_callback' ), 10, 3 );
</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">- 'somegroup', 'mycustomsetting1', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'somegroup',
+ 'mycustomsetting1',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'mycustomsettinginrest1',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,7 +280,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"> register_setting(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'somegroup', 'mycustomsetting2', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'somegroup',
+ 'mycustomsetting2',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'mycustomsettinginrest2',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,7 +313,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$administrator );
</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">- 'somegroup', 'mycustomsetting', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'somegroup',
+ 'mycustomsetting',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'mycustomsettinginrest',
</span><span class="cx" style="display: block; padding: 0 10px"> 'schema' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,7 +339,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$administrator );
</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">- 'somegroup', 'mycustomsetting', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'somegroup',
+ 'mycustomsetting',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'mycustomsettinginrest',
</span><span class="cx" style="display: block; padding: 0 10px"> 'schema' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -374,7 +389,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_update_item_with_array() {
</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">- 'somegroup', 'mycustomsetting', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'somegroup',
+ 'mycustomsetting',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'schema' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'array',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -418,7 +435,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_update_item_with_nested_object() {
</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">- 'somegroup', 'mycustomsetting', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'somegroup',
+ 'mycustomsetting',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'schema' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'object',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -445,7 +464,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'PUT', '/wp/v2/settings' );
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mycustomsetting', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mycustomsetting',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'a' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'b' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'c' => 1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -458,7 +478,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_update_item_with_object() {
</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">- 'somegroup', 'mycustomsetting', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'somegroup',
+ 'mycustomsetting',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'schema' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'object',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -496,7 +518,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Provide more keys.
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'PUT', '/wp/v2/settings' );
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mycustomsetting', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mycustomsetting',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'a' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'b' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -598,7 +621,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$administrator );
</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">- 'somegroup', 'mycustomsetting', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'somegroup',
+ 'mycustomsetting',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,31 +58,51 @@
</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">- register_meta( 'term', 'test_single', array(
- 'show_in_rest' => true,
- 'single' => true,
- 'type' => 'string',
- ));
- register_meta( 'term', 'test_multi', array(
- 'show_in_rest' => true,
- 'single' => false,
- 'type' => 'string',
- ));
- register_term_meta( 'post_tag', 'test_tag_single', array(
- 'show_in_rest' => true,
- 'single' => true,
- 'type' => 'string',
- ));
- register_term_meta( 'post_tag', 'test_tag_multi', array(
- 'show_in_rest' => true,
- 'single' => false,
- 'type' => 'string',
- ));
- register_term_meta( 'category', 'test_cat_meta', array(
- 'show_in_rest' => true,
- 'single' => true,
- 'type' => 'string',
- ));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_meta(
+ 'term',
+ 'test_single',
+ array(
+ 'show_in_rest' => true,
+ 'single' => true,
+ 'type' => 'string',
+ )
+ );
+ register_meta(
+ 'term',
+ 'test_multi',
+ array(
+ 'show_in_rest' => true,
+ 'single' => false,
+ 'type' => 'string',
+ )
+ );
+ register_term_meta(
+ 'post_tag',
+ 'test_tag_single',
+ array(
+ 'show_in_rest' => true,
+ 'single' => true,
+ 'type' => 'string',
+ )
+ );
+ register_term_meta(
+ 'post_tag',
+ 'test_tag_multi',
+ array(
+ 'show_in_rest' => true,
+ 'single' => false,
+ 'type' => 'string',
+ )
+ );
+ register_term_meta(
+ 'category',
+ 'test_cat_meta',
+ array(
+ 'show_in_rest' => true,
+ 'single' => true,
+ 'type' => '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"> public function test_register_routes() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,7 +147,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'search',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug',
</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"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -464,7 +485,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->factory->tag->create( array( 'name' => 'Pizza' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'slug', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'slug',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taco',
</span><span class="cx" style="display: block; padding: 0 10px"> 'burrito',
</span><span class="cx" style="display: block; padding: 0 10px"> 'enchilada',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -530,7 +552,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $next_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( 'wp/v2/tags' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( 'wp/v2/tags' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( stripos( $headers['Link'], 'rel="prev"' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -549,13 +572,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( 'wp/v2/tags' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( 'wp/v2/tags' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $next_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 4,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( 'wp/v2/tags' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( 'wp/v2/tags' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
</span><span class="cx" style="display: block; padding: 0 10px"> // Last page
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -568,7 +593,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 5,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( 'wp/v2/tags' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( 'wp/v2/tags' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( stripos( $headers['Link'], 'rel="next"' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -582,7 +608,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 6,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( 'wp/v2/tags' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( 'wp/v2/tags' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( stripos( $headers['Link'], 'rel="next"' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -606,7 +633,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->tag->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', '/wp/v2/tags/' . $id );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = rest_get_server()->dispatch( $request );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data = $response->get_data();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data = $response->get_data();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'meta', $data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $meta = (array) $data['meta'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -624,7 +651,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->tag->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', '/wp/v2/tags/' . $id );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = rest_get_server()->dispatch( $request );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data = $response->get_data();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data = $response->get_data();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'meta', $data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $meta = (array) $data['meta'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -742,11 +769,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'name', 'New Name' );
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'description', 'New Description' );
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'slug', 'new-slug' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $request->set_param( 'meta', array(
- 'test_single' => 'just meta',
- 'test_tag_single' => 'tag-specific meta',
- 'test_cat_meta' => 'category-specific meta',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request->set_param(
+ 'meta',
+ array(
+ 'test_single' => 'just meta',
+ 'test_tag_single' => 'tag-specific meta',
+ 'test_cat_meta' => 'category-specific meta',
+ )
+ );
</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"> $data = $response->get_data();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -897,7 +927,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => '\o/ ¯\_(ツ)_/¯',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => '\o/ ¯\_(ツ)_/¯',
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => '\o/ ¯\_(ツ)_/¯',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => '\o/ ¯\_(ツ)_/¯',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -912,7 +943,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'div strong',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => 'div <strong>strong</strong> oh noes',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -923,7 +955,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'div strong',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => 'div <strong>strong</strong> oh noes',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -938,7 +971,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => '\\\&\\\ & &invalid; < < &lt;',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => '\\\&\\\ & &invalid; < < &lt;',
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => '\\\&\\\ & &invalid; < < &lt;',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => '\\\&\\\ & &invalid; < < &lt;',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -952,7 +986,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'div strong',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => 'div <strong>strong</strong> oh noes',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1063,10 +1098,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( '_fields', 'id,name' );
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $endpoint->prepare_item_for_response( $term, $request );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array(
- 'id',
- 'name',
- ), array_keys( $response->get_data() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals(
+ array(
+ 'id',
+ 'name',
+ ),
+ array_keys( $response->get_data() )
+ );
</ins><span class="cx" style="display: 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_item_schema() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1105,7 +1143,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"> register_rest_field(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'tag', 'my_custom_int', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'tag',
+ 'my_custom_int',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'schema' => $schema,
</span><span class="cx" style="display: block; padding: 0 10px"> 'get_callback' => array( $this, 'additional_field_get_callback' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1137,7 +1177,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"> register_rest_field(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'tag', 'my_custom_int', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'tag',
+ 'my_custom_int',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'schema' => $schema,
</span><span class="cx" style="display: block; padding: 0 10px"> 'get_callback' => array( $this, 'additional_field_get_callback' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'update_callback' => array( $this, 'additional_field_update_callback' ),
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rest-api/rest-taxonomies-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> public function test_get_items_context_edit() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$contributor_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $request = new WP_REST_Request( 'GET', '/wp/v2/taxonomies' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request = new WP_REST_Request( 'GET', '/wp/v2/taxonomies' );
</ins><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_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">@@ -186,10 +186,13 @@
</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"> $request->set_param( '_fields', 'id,name' );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $endpoint->prepare_item_for_response( $tax, $request );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array(
- // 'id' doesn't exist in this context.
- 'name',
- ), array_keys( $response->get_data() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals(
+ array(
+ // 'id' doesn't exist in this context.
+ 'name',
+ ),
+ array_keys( $response->get_data() )
+ );
</ins><span class="cx" style="display: 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_item_schema() {
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapiresttermmetafieldsphp"></a>
<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-term-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-term-meta-fields.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rest-api/rest-term-meta-fields.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,9 +15,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $customtax_term_id;
</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">- register_taxonomy( 'customtax', 'post', array(
- 'show_in_rest' => true,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_taxonomy(
+ 'customtax',
+ 'post',
+ array(
+ 'show_in_rest' => true,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> self::$wp_meta_keys_saved = isset( $GLOBALS['wp_meta_keys'] ) ? $GLOBALS['wp_meta_keys'] : array();
</span><span class="cx" style="display: block; padding: 0 10px"> self::$category_id = $factory->category->create();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +40,9 @@
</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"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'term', 'test_single', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'term',
+ 'test_single',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +49,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"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'term', 'test_multi', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'term',
+ 'test_multi',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +58,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"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'term', 'test_bad_auth', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'term',
+ 'test_bad_auth',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'auth_callback' => '__return_false',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +68,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"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'term', 'test_bad_auth_multi', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'term',
+ 'test_bad_auth_multi',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'auth_callback' => '__return_false',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,13 +79,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> register_meta( 'term', 'test_no_rest', array() );
</span><span class="cx" style="display: block; padding: 0 10px"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'term', 'test_rest_disabled', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'term',
+ 'test_rest_disabled',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'term', 'test_custom_schema', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'term',
+ 'test_custom_schema',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'integer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,7 +100,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"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'term', 'test_custom_schema_multi', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'term',
+ 'test_custom_schema_multi',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'single' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'integer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,7 +113,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"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'term', 'test_invalid_type', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'term',
+ 'test_invalid_type',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'lalala',
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,7 +122,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"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'term', 'test_no_type', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'term',
+ 'test_no_type',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +132,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"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'term', 'test_custom_name', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'term',
+ 'test_custom_name',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,7 +144,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"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'term', 'test_custom_name_multi', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'term',
+ 'test_custom_name_multi',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'single' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,26 +155,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">- register_taxonomy( 'customtax', 'post', array(
- 'show_in_rest' => true,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_taxonomy(
+ 'customtax',
+ 'post',
+ array(
+ 'show_in_rest' => 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">- register_term_meta( 'customtax', 'test_customtax_single', array(
- 'show_in_rest' => true,
- 'single' => true,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_term_meta(
+ 'customtax',
+ 'test_customtax_single',
+ array(
+ 'show_in_rest' => true,
+ 'single' => 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">- register_term_meta( 'customtax', 'test_customtax_multi', array(
- 'show_in_rest' => true,
- 'single' => false,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_term_meta(
+ 'customtax',
+ 'test_customtax_multi',
+ array(
+ 'show_in_rest' => true,
+ 'single' => false,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Register 'test_single' on subtype to override for bad auth.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- register_term_meta( 'customtax', 'test_single', array(
- 'show_in_rest' => true,
- 'single' => true,
- 'auth_callback' => '__return_false',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_term_meta(
+ 'customtax',
+ 'test_single',
+ array(
+ 'show_in_rest' => true,
+ 'single' => true,
+ 'auth_callback' => '__return_false',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** @var WP_REST_Server $wp_rest_server */
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_rest_server;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,7 +298,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_value_types() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'term', 'test_string', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'term',
+ 'test_string',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,7 +307,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"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'term', 'test_number', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'term',
+ 'test_number',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'number',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,7 +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"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'term', 'test_bool', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'term',
+ 'test_bool',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'boolean',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -571,7 +619,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_set_value_invalid_value() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'term', 'my_meta_key', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'term',
+ 'my_meta_key',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -594,7 +644,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_set_value_invalid_value_multiple() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'term', 'my_meta_key', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'term',
+ 'my_meta_key',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -617,7 +669,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_set_value_sanitized() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'term', 'my_meta_key', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'term',
+ 'my_meta_key',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'integer',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -641,7 +695,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_set_value_csv() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_meta(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'term', 'my_meta_key', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'term',
+ 'my_meta_key',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'integer',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1093,7 +1149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $term_id, $meta_key, $meta_value );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/%s/%d', $endpoint, $term_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/%s/%d', $endpoint, $term_id ) );
</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">
</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">@@ -1146,11 +1202,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->grant_write_permission();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'POST', sprintf( '/wp/v2/%s/%d', $endpoint, $term_id ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $request->set_body_params( array(
- 'meta' => array(
- $meta_key => $meta_value,
- ),
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request->set_body_params(
+ array(
+ 'meta' => array(
+ $meta_key => $meta_value,
+ ),
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</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"> if ( ! $can_write ) {
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rest-api/rest-users-controller.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> 'user_email' => 'draft-editor@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">- self::$subscriber = $factory->user->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$subscriber = $factory->user->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'subscriber',
</span><span class="cx" style="display: block; padding: 0 10px"> 'display_name' => 'subscriber',
</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"> foreach ( array( true, false ) as $public ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_name = 'r_' . json_encode( $show_in_rest ) . '_p_' . json_encode( $public );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_type_name, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_type_name,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => $public,
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => $show_in_rest,
</span><span class="cx" style="display: block; padding: 0 10px"> 'tests_no_auto_unregister' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,7 +176,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'search',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug',
</span><span class="cx" style="display: block; padding: 0 10px"> 'who',
</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"> );
</span><span class="cx" style="display: block; padding: 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 +296,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $next_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( 'wp/v2/users' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( 'wp/v2/users' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( stripos( $headers['Link'], 'rel="prev"' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,13 +316,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( 'wp/v2/users' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( 'wp/v2/users' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $next_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 4,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( 'wp/v2/users' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( 'wp/v2/users' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
</span><span class="cx" style="display: block; padding: 0 10px"> // Last page
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -332,7 +337,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 5,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( 'wp/v2/users' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( 'wp/v2/users' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( stripos( $headers['Link'], 'rel="next"' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -346,7 +352,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 6,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( 'wp/v2/users' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( 'wp/v2/users' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( stripos( $headers['Link'], 'rel="next"' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -380,7 +387,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'per_page' => 5,
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 1,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), rest_url( 'wp/v2/users' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ rest_url( 'wp/v2/users' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $headers = $response->get_headers();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -682,7 +690,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'slug', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'slug',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taco',
</span><span class="cx" style="display: block; padding: 0 10px"> 'burrito',
</span><span class="cx" style="display: block; padding: 0 10px"> 'enchilada',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -856,10 +865,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( '_fields', 'id,name' );
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_user_by( 'id', get_current_user_id() );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $this->endpoint->prepare_item_for_response( $user, $request );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array(
- 'id',
- 'name',
- ), array_keys( $response->get_data() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals(
+ array(
+ 'id',
+ 'name',
+ ),
+ array_keys( $response->get_data() )
+ );
</ins><span class="cx" style="display: 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_user_avatar_urls() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1993,7 +2005,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => '\o/ ¯\_(ツ)_/¯',
</span><span class="cx" style="display: block; padding: 0 10px"> 'nickname' => '\o/ ¯\_(ツ)_/¯',
</span><span class="cx" style="display: block; padding: 0 10px"> 'password' => 'o/ ¯_(ツ)_/¯ \'"',
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => '\o/ ¯\_(ツ)_/¯',
</span><span class="cx" style="display: block; padding: 0 10px"> 'first_name' => '\o/ ¯\_(ツ)_/¯',
</span><span class="cx" style="display: block; padding: 0 10px"> 'last_name' => '\o/ ¯\_(ツ)_/¯',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2019,7 +2032,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'nickname' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'password' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'div strong',
</span><span class="cx" style="display: block; padding: 0 10px"> 'first_name' => 'div strong',
</span><span class="cx" style="display: block; padding: 0 10px"> 'last_name' => 'div strong',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2041,7 +2055,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'nickname' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'password' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'div strong',
</span><span class="cx" style="display: block; padding: 0 10px"> 'first_name' => 'div strong',
</span><span class="cx" style="display: block; padding: 0 10px"> 'last_name' => 'div strong',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2068,7 +2083,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => '\\\&\\\ & &invalid; < < &lt;',
</span><span class="cx" style="display: block; padding: 0 10px"> 'nickname' => '\\\&\\\ & &invalid; < < &lt;',
</span><span class="cx" style="display: block; padding: 0 10px"> 'password' => '& & &invalid; < < &lt;',
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'username' => $valid_username,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => '\\\&\\\ & &invalid; < < &lt;',
</span><span class="cx" style="display: block; padding: 0 10px"> 'first_name' => '\\\&\\\ & &invalid; < < &lt;',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2095,7 +2111,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'nickname' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'password' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'username' => $valid_username,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'div strong',
</span><span class="cx" style="display: block; padding: 0 10px"> 'first_name' => 'div strong',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2483,7 +2500,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"> register_rest_field(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user', 'my_custom_int', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user',
+ 'my_custom_int',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'schema' => $schema,
</span><span class="cx" style="display: block; padding: 0 10px"> 'get_callback' => array( $this, 'additional_field_get_callback' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'update_callback' => array( $this, 'additional_field_update_callback' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2546,7 +2565,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"> register_rest_field(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user', 'my_custom_int', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user',
+ 'my_custom_int',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'schema' => $schema,
</span><span class="cx" style="display: block; padding: 0 10px"> 'get_callback' => array( $this, 'additional_field_get_callback' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'update_callback' => array( $this, 'additional_field_update_callback' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2757,7 +2778,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'self',
</span><span class="cx" style="display: block; padding: 0 10px"> 'collection',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), array_keys( $links )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array_keys( $links )
</ins><span class="cx" style="display: 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->assertArrayNotHasKey( 'password', $data );
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rest-api.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,7 +78,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_route_canonicalized() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test-ns', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test-ns',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => array( 'GET' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +113,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_route_canonicalized_multiple() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test-ns', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test-ns',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'methods' => array( 'GET' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,13 +154,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_route_merge() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test-ns', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test-ns',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => array( 'GET' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__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="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test-ns', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test-ns',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => array( 'POST' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,7 +181,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_route_override() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test-ns', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test-ns',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => array( 'GET' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><span class="cx" style="display: block; padding: 0 10px"> 'should_exist' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,11 +190,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"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test-ns', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test-ns',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => array( 'POST' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><span class="cx" style="display: block; padding: 0 10px"> 'should_exist' => true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), true
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ true
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check we only have one route.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,10 +217,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_route_reject_empty_namespace() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '', '/test-empty-namespace', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '',
+ '/test-empty-namespace',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => array( 'POST' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), true
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ true
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $endpoints = $GLOBALS['wp_rest_server']->get_routes();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( isset( $endpoints['/test-empty-namespace'] ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,10 +236,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_route_reject_empty_route() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '/test-empty-route', '', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '/test-empty-route',
+ '',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => array( 'POST' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), true
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ true
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $endpoints = $GLOBALS['wp_rest_server']->get_routes();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( isset( $endpoints['/test-empty-route'] ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -239,7 +258,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_route_method() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test-ns', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test-ns',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => array( 'GET' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,7 +276,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_route_method_string() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test-ns', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test-ns',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => 'GET',
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,7 +294,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_route_method_array() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test-ns', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test-ns',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => array( 'GET', 'POST' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,7 +305,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $routes = $GLOBALS['wp_rest_server']->get_routes();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $routes['/test-ns/test'][0]['methods'], array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $routes['/test-ns/test'][0]['methods'],
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'GET' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'POST' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -292,7 +318,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_route_method_comma_seperated() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test-ns', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test-ns',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => 'GET,POST',
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,7 +329,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $routes = $GLOBALS['wp_rest_server']->get_routes();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $routes['/test-ns/test'][0]['methods'], array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $routes['/test-ns/test'][0]['methods'],
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'GET' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'POST' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,7 +339,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_options_request() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test-ns', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test-ns',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => 'GET,POST',
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -330,7 +361,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_options_request_not_options() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test-ns', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test-ns',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => 'GET,POST',
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_true',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -399,7 +432,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'b' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'c' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'e' => 4,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $response->get_data()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $response->get_data()
</ins><span class="cx" style="display: block; 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">@@ -430,7 +464,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'b' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'c' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'e' => 4,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $response->get_data()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $response->get_data()
</ins><span class="cx" style="display: block; 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 +512,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'b' => 7,
</span><span class="cx" style="display: block; padding: 0 10px"> 'c' => 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">- ), $response->get_data()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $response->get_data()
</ins><span class="cx" style="display: block; 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">@@ -665,7 +701,9 @@
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> register_rest_route(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test-ns', '/test', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'test-ns',
+ '/test',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'methods' => array( 'GET' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => '__return_null',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunktestsphpunittestsrewriteaddRewriteRulephp"></a>
<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/addRewriteRule.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rewrite/addRewriteRule.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rewrite/addRewriteRule.php 2018-08-17 01:50:26 UTC (rev 43571)
</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"> $redirect = 'index.php?test_var1=$matches[1]&test_var2=1';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_rewrite_rule(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pattern, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pattern,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'test_var1' => '$matches[1]',
</span><span class="cx" style="display: block; padding: 0 10px"> 'test_var2' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunktestsphpunittestsrewriteoldDateRedirectphp"></a>
<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/oldDateRedirect.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rewrite/oldDateRedirect.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rewrite/oldDateRedirect.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,10 +11,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static $attachment_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public static function wpSetUpBeforeClass() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$post_id = self::factory()->post->create( array(
- 'post_title' => 'Foo Bar',
- 'post_name' => 'foo-bar',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$post_id = self::factory()->post->create(
+ array(
+ 'post_title' => 'Foo Bar',
+ 'post_name' => 'foo-bar',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> self::$attachment_id = self::factory()->attachment->create_object(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,11 +51,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $old_permalink = user_trailingslashit( get_permalink( self::$post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $time = '2004-01-03 00:00:00';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_update_post( array(
- 'ID' => self::$post_id,
- 'post_date' => $time,
- 'post_date_gmt' => get_gmt_from_date( $time ),
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_post(
+ array(
+ 'ID' => self::$post_id,
+ 'post_date' => $time,
+ 'post_date_gmt' => get_gmt_from_date( $time ),
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $permalink = user_trailingslashit( get_permalink( self::$post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,12 +70,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $old_permalink = user_trailingslashit( get_permalink( self::$post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $time = '2004-01-03 00:00:00';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_update_post( array(
- 'ID' => self::$post_id,
- 'post_date' => $time,
- 'post_date_gmt' => get_gmt_from_date( $time ),
- 'post_name' => 'bar-baz',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_post(
+ array(
+ 'ID' => self::$post_id,
+ 'post_date' => $time,
+ 'post_date_gmt' => get_gmt_from_date( $time ),
+ 'post_name' => 'bar-baz',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $permalink = user_trailingslashit( get_permalink( self::$post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,11 +90,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $old_permalink = get_attachment_link( self::$attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $time = '2004-01-03 00:00:00';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_update_post( array(
- 'ID' => self::$post_id,
- 'post_date' => $time,
- 'post_date_gmt' => get_gmt_from_date( $time ),
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_post(
+ array(
+ 'ID' => self::$post_id,
+ 'post_date' => $time,
+ 'post_date_gmt' => get_gmt_from_date( $time ),
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $old_permalink );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_old_slug_redirect();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,10 +105,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $old_permalink = get_attachment_link( self::$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">- wp_update_post( array(
- 'ID' => self::$attachment_id,
- 'post_name' => 'the-attachment',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_post(
+ array(
+ 'ID' => self::$attachment_id,
+ 'post_name' => 'the-attachment',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $permalink = user_trailingslashit( trailingslashit( get_permalink( self::$post_id ) ) . 'the-attachment' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,12 +123,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $old_permalink = get_attachment_link( self::$attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $time = '2004-01-03 00:00:00';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_update_post( array(
- 'ID' => self::$post_id,
- 'post_date' => $time,
- 'post_date_gmt' => get_gmt_from_date( $time ),
- 'post_name' => 'bar-baz',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_post(
+ array(
+ 'ID' => self::$post_id,
+ 'post_date' => $time,
+ 'post_date_gmt' => get_gmt_from_date( $time ),
+ 'post_name' => 'bar-baz',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $old_permalink );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_old_slug_redirect();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,10 +139,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $old_permalink = get_attachment_link( self::$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">- wp_update_post( array(
- 'ID' => self::$attachment_id,
- 'post_name' => 'the-attachment',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_post(
+ array(
+ 'ID' => self::$attachment_id,
+ 'post_name' => 'the-attachment',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $permalink = user_trailingslashit( trailingslashit( get_permalink( self::$post_id ) ) . 'the-attachment' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,19 +154,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"> public function test_old_date_redirect_paged() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_update_post( array(
- 'ID' => self::$post_id,
- 'post_content' => 'Test<!--nextpage-->Test',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_post(
+ array(
+ 'ID' => self::$post_id,
+ 'post_content' => 'Test<!--nextpage-->Test',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $old_permalink = user_trailingslashit( trailingslashit( get_permalink( self::$post_id ) ) . 'page/2' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $time = '2004-01-03 00:00:00';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_update_post( array(
- 'ID' => self::$post_id,
- 'post_date' => $time,
- 'post_date_gmt' => get_gmt_from_date( $time ),
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_post(
+ array(
+ 'ID' => self::$post_id,
+ 'post_date' => $time,
+ 'post_date_gmt' => get_gmt_from_date( $time ),
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $permalink = user_trailingslashit( trailingslashit( get_permalink( self::$post_id ) ) . 'page/2' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,20 +180,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"> public function test_old_date_slug_redirect_paged() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_update_post( array(
- 'ID' => self::$post_id,
- 'post_content' => 'Test<!--nextpage-->Test',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_post(
+ array(
+ 'ID' => self::$post_id,
+ 'post_content' => 'Test<!--nextpage-->Test',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $old_permalink = user_trailingslashit( trailingslashit( get_permalink( self::$post_id ) ) . 'page/2' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $time = '2004-01-04 12:00:00';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_update_post( array(
- 'ID' => self::$post_id,
- 'post_date' => $time,
- 'post_date_gmt' => get_gmt_from_date( $time ),
- 'post_name' => 'bar-baz',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_post(
+ array(
+ 'ID' => self::$post_id,
+ 'post_date' => $time,
+ 'post_date_gmt' => get_gmt_from_date( $time ),
+ 'post_name' => 'bar-baz',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $permalink = user_trailingslashit( trailingslashit( get_permalink( self::$post_id ) ) . 'page/2' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,17 +210,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $old_permalink = user_trailingslashit( get_permalink( self::$post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $time = '2004-01-04 12:00:00';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_update_post( array(
- 'ID' => self::$post_id,
- 'post_date' => $time,
- 'post_date_gmt' => get_gmt_from_date( $time ),
- 'post_name' => 'bar-baz',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_post(
+ array(
+ 'ID' => self::$post_id,
+ 'post_date' => $time,
+ 'post_date_gmt' => get_gmt_from_date( $time ),
+ 'post_name' => 'bar-baz',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $new_post_id = self::factory()->post->create( array(
- 'post_title' => 'Foo Bar',
- 'post_name' => 'foo-bar',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new_post_id = self::factory()->post->create(
+ array(
+ 'post_title' => 'Foo Bar',
+ 'post_name' => 'foo-bar',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $permalink = user_trailingslashit( get_permalink( $new_post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsrewriteoldSlugRedirectphp"></a>
<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/oldSlugRedirect.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rewrite/oldSlugRedirect.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rewrite/oldSlugRedirect.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,7 +57,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_old_slug_redirect_attachment() {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $file, $this->post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $file,
+ $this->post_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'my-attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunktestsphpunittestsrewritepermastructsphp"></a>
<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/permastructs.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rewrite/permastructs.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rewrite/permastructs.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'endpoints' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'forcomments' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'struct' => '/bar/%foo%',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $wp_rewrite->extra_permastructs['foo']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $wp_rewrite->extra_permastructs['foo']
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/rewrite.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect = 'index.php?test_var1=$matches[1]&test_var2=1';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_rewrite->add_rule(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pattern, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pattern,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'test_var1' => '$matches[1]',
</span><span class="cx" style="display: block; padding: 0 10px"> 'test_var2' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +283,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'pagename' => 'page',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $GLOBALS['wp']->query_vars
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $GLOBALS['wp']->query_vars
</ins><span class="cx" style="display: block; 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">@@ -302,7 +304,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'pagename' => 'page',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $GLOBALS['wp']->query_vars
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $GLOBALS['wp']->query_vars
</ins><span class="cx" style="display: 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( $not_a_home_url . 'page' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,13 +313,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'pagename' => 'page',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $GLOBALS['wp']->query_vars
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $GLOBALS['wp']->query_vars
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</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="cx" style="display: block; padding: 0 10px"> 'page' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'pagename' => 'match/page',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $GLOBALS['wp']->query_vars
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $GLOBALS['wp']->query_vars
</ins><span class="cx" style="display: block; 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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/shortcode.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'no foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'baz' => 'default baz',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $atts, 'bartag'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $atts,
+ 'bartag'
</ins><span class="cx" style="display: block; 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,7 +166,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'asdf',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bar' => 'bing',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $this->atts
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $this->atts
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'test-shortcode-tag', $this->tagname );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +192,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'baz' => 'bing',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $this->atts
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $this->atts
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'content', $this->content );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'test-shortcode-tag', $this->tagname );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,7 +227,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 0 => 'something in quotes',
</span><span class="cx" style="display: block; padding: 0 10px"> 1 => 'something else',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $this->atts
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $this->atts
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'test-shortcode-tag', $this->tagname );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,7 +243,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 2 => '0',
</span><span class="cx" style="display: block; padding: 0 10px"> 3 => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 4 => 'bar',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $this->atts
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $this->atts
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'test-shortcode-tag', $this->tagname );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,7 +258,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => 'https://wordpress.org/',
</span><span class="cx" style="display: block; padding: 0 10px"> 1 => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bar' => 'baz',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $this->atts
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $this->atts
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'test-shortcode-tag', $this->tagname );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -357,7 +364,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'baz' => '123',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $this->atts
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $this->atts
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '', $this->content );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -372,7 +380,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'abc' => 'def',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $this->atts
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $this->atts
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '', $this->content );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -458,13 +467,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'foo1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'baz' => 'default baz',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $this->filter_atts_out
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $this->filter_atts_out
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</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="cx" style="display: block; padding: 0 10px"> 'foo' => 'no foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'baz' => 'default baz',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $this->filter_atts_pairs
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $this->filter_atts_pairs
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( 'foo' => 'foo1' ), $this->filter_atts_atts );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -922,7 +933,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 0 => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 1 => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 2 => 'baz',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $this->atts
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $this->atts
</ins><span class="cx" style="display: block; 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">@@ -936,7 +948,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 0 => 'something in quotes',
</span><span class="cx" style="display: block; padding: 0 10px"> 1 => 'something else',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $this->atts
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $this->atts
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'test-shortcode-tag', $this->tagname );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -955,7 +968,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 3 => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bar' => 'baz',
</span><span class="cx" style="display: block; padding: 0 10px"> 'example' => 'test',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $this->atts
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $this->atts
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'test-shortcode-tag', $this->tagname );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunitteststaxonomygetObjectTaxonomiesphp"></a>
<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/getObjectTaxonomies.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/taxonomy/getObjectTaxonomies.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/taxonomy/getObjectTaxonomies.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax2', 'attachment:image' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $a = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image.jpg', 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image.jpg',
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +74,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax2', 'attachment:image' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $a = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image.jpg', 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'image.jpg',
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/taxonomy.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,10 +66,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_the_taxonomies() {
</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">- $this->expectOutputString( sprintf(
- 'Categories: <a href="%s">Uncategorized</a>.',
- get_category_link( 1 )
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->expectOutputString(
+ sprintf(
+ 'Categories: <a href="%s">Uncategorized</a>.',
+ get_category_link( 1 )
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> the_taxonomies( 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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +82,8 @@
</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><span class="cx" style="display: block; padding: 0 10px"> $output = get_echo(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'the_taxonomies', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'the_taxonomies',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post' => $post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'term_template' => '%2$s',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +93,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'Categories: Uncategorized.', $output );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $output = get_echo(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'the_taxonomies', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'the_taxonomies',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post' => $post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'term_template' => '<span class="foo"><a href="%1$s">%2$s</a></span>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,13 +192,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_register_taxonomy_show_in_quick_edit_should_default_to_value_of_show_ui() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax_1', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax_1',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_ui' => 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"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax_2', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax_2',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_ui' => 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">@@ -449,7 +457,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_ancestors_taxonomy() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => 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">@@ -494,7 +504,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_ancestors_post_type() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_pt', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_pt',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => 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">@@ -531,7 +542,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_ancestors_taxonomy_post_type_conflict_resource_type_taxonomy() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_conflict', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_conflict',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => 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">@@ -548,7 +560,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"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_conflict', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_conflict',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => 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">@@ -575,7 +589,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_nonpublicly_queryable_taxonomy_should_not_be_queryable_using_taxname_query_var() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'publicly_queryable' => 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">@@ -601,7 +617,9 @@
</span><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"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'publicly_queryable' => 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">@@ -638,7 +656,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_nonpublicly_queryable_taxonomy_should_not_be_queryable_using_taxonomy_and_term_vars() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'publicly_queryable' => 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">@@ -662,7 +682,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_public_taxonomy_should_be_publicly_queryable() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => 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">@@ -688,7 +710,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_private_taxonomy_should_not_be_publicly_queryable() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => 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">@@ -714,7 +738,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_private_taxonomy_should_be_overridden_by_publicly_queryable() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'publicly_queryable' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -741,7 +767,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_query_var_should_be_forced_to_false_for_non_public_taxonomy() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'query_var' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -797,7 +825,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_rewrite;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'query_var' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'rewrite' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -890,7 +920,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term_name = 'bar';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy_name, array( 'post' ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $taxonomy_name,
+ array( 'post' ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_box_cb' => 'post_categories_meta_box',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunktestsphpunitteststemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/template.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/template.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,12 +50,15 @@
</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"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'cpt', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'cpt',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => 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"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'taxo', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxo',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,11 +78,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'p' => '-1',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), home_url()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ home_url()
</ins><span class="cx" style="display: 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->assertTemplateHierarchy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> '404.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">@@ -93,7 +98,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"> $this->assertTemplateHierarchy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_author_posts_url( $author->ID ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_author_posts_url( $author->ID ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'author-foo.php',
</span><span class="cx" style="display: block; padding: 0 10px"> "author-{$author->ID}.php",
</span><span class="cx" style="display: block; padding: 0 10px"> 'author.php',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +117,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"> $this->assertTemplateHierarchy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_term_link( $term ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_term_link( $term ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'category-foo-😀.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'category-foo-%f0%9f%98%80.php',
</span><span class="cx" style="display: block; padding: 0 10px"> "category-{$term->term_id}.php",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +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"> $this->assertTemplateHierarchy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_term_link( $term ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_term_link( $term ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'tag-foo-😀.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'tag-foo-%f0%9f%98%80.php',
</span><span class="cx" style="display: block; padding: 0 10px"> "tag-{$term->term_id}.php",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +157,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"> $this->assertTemplateHierarchy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_term_link( $term ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_term_link( $term ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy-taxo-foo-😀.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy-taxo-foo-%f0%9f%98%80.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy-taxo.php',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,7 +170,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_date_template_hierarchy_for_year() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTemplateHierarchy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_year_link( 1984 ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_year_link( 1984 ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'date.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'archive.php',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,7 +180,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_date_template_hierarchy_for_month() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTemplateHierarchy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_month_link( 1984, 2 ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_month_link( 1984, 2 ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'date.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'archive.php',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,7 +190,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_date_template_hierarchy_for_day() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTemplateHierarchy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_day_link( 1984, 2, 25 ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_day_link( 1984, 2, 25 ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'date.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'archive.php',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,11 +202,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 's' => 'foo',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), home_url()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ home_url()
</ins><span class="cx" style="display: 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->assertTemplateHierarchy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'search.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">@@ -203,7 +217,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_front_page_template_hierarchy_with_posts_on_front() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'posts', get_option( 'show_on_front' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTemplateHierarchy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- home_url(), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ home_url(),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'front-page.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'home.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'index.php',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,7 +232,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'page_for_posts', self::$page_for_posts->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTemplateHierarchy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- home_url(), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ home_url(),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'front-page.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'page-page-on-front-😀.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'page-page-on-front-%f0%9f%98%80.php',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,7 +250,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'page_for_posts', self::$page_for_posts->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTemplateHierarchy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_permalink( self::$page_for_posts ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_permalink( self::$page_for_posts ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'home.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'index.php',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,7 +260,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_page_template_hierarchy() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTemplateHierarchy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_permalink( self::$page ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_permalink( self::$page ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'templates/page.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'page-page-name-😀.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'page-page-name-%f0%9f%98%80.php',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -259,7 +277,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_single_template_hierarchy_for_post() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTemplateHierarchy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_permalink( self::$post ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_permalink( self::$post ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'templates/post.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'single-post-post-name-😀.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'single-post-post-name-%f0%9f%98%80.php',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,7 +298,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"> $this->assertTemplateHierarchy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_permalink( $cpt ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_permalink( $cpt ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'single-cpt-cpt-name-😀.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'single-cpt-cpt-name-%f0%9f%98%80.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'single-cpt.php',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,7 +322,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $cpt->ID, '_wp_page_template', 'templates/cpt.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTemplateHierarchy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_permalink( $cpt ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_permalink( $cpt ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'templates/cpt.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'single-cpt-cpt-name-😀.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'single-cpt-cpt-name-%f0%9f%98%80.php',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,7 +343,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"> $this->assertTemplateHierarchy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_permalink( $attachment ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_permalink( $attachment ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'image-jpeg.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'jpeg.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'image.php',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,7 +373,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $attachment, '_wp_page_template', 'templates/cpt.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTemplateHierarchy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_permalink( $attachment ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_permalink( $attachment ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'image-jpeg.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'jpeg.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'image.php',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -367,7 +390,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_embed_template_hierarchy_for_post() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTemplateHierarchy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_post_embed_url( self::$post ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_post_embed_url( self::$post ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'embed-post-quote.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'embed-post.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'embed.php',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -383,7 +407,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_embed_template_hierarchy_for_page() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTemplateHierarchy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_post_embed_url( self::$page ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_post_embed_url( self::$page ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'embed-page.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'embed.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'templates/page.php',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/term/cache.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id1 => array( $term_id1_child ),
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id2 => array( $term_id2_child ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $hierarchy
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $hierarchy
</ins><span class="cx" style="display: block; 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">@@ -194,13 +195,15 @@
</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><span class="cx" style="display: block; padding: 0 10px"> $terms = self::factory()->term->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 5, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 5,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_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">
</span><span class="cx" style="display: block; padding: 0 10px"> $term_objects = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => 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="trunktestsphpunitteststermgetEditTermLinkphp"></a>
<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/getEditTermLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getEditTermLink.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/term/getEditTermLink.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +74,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_cap_check_should_use_correct_taxonomy_when_taxonomy_is_not_specified() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax_subscriber', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax_subscriber',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'capabilities' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit_terms' => 'read',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span></span></pre></div>
<a id="trunktestsphpunitteststermgetTagLinkphp"></a>
<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/getTagLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getTagLink.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/term/getTagLink.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,12 +6,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Term_GetTagLink extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_success() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = self::factory()->term->create( array(
- 'taxonomy' => 'post_tag',
- 'slug' => 'term-slug',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::factory()->term->create(
+ array(
+ 'taxonomy' => 'post_tag',
+ 'slug' => 'term-slug',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $found = get_tag_link( $t );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found = get_tag_link( $t );
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = home_url( '?tag=term-slug' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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">@@ -23,14 +25,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_return_link_for_term_from_another_taxonomy_on_primed_cache() {
</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">- $t = self::factory()->term->create( array(
- 'taxonomy' => 'wptests_tax',
- 'slug' => 'test-term',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::factory()->term->create(
+ array(
+ 'taxonomy' => 'wptests_tax',
+ 'slug' => 'test-term',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $t );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $found = get_tag_link( $t );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found = get_tag_link( $t );
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = home_url( '?wptests_tax=test-term' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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">@@ -42,14 +46,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_return_link_for_term_from_another_taxonomy_on_empty_cache() {
</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">- $t = self::factory()->term->create( array(
- 'taxonomy' => 'wptests_tax',
- 'slug' => 'test-term',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::factory()->term->create(
+ array(
+ 'taxonomy' => 'wptests_tax',
+ 'slug' => 'test-term',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> clean_term_cache( $t );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $found = get_tag_link( $t );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found = get_tag_link( $t );
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = home_url( '?wptests_tax=test-term' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $found );
</span></span></pre></div>
<a id="trunktestsphpunitteststermgetTermLinkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/getTermLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getTermLink.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/term/getTermLink.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_taxonomy_with_query_var_should_use_that_query_var_with_term_slug() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax2', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax2',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'query_var' => 'foo',
</span><span class="cx" style="display: block; padding: 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,7 +85,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_taxonomy_without_query_var_should_use_taxonomy_query_var_and_term_query_var_with_term_slug() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax2', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax2',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> '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">@@ -104,7 +108,9 @@
</span><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"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax2', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax2',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'rewrite' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +145,9 @@
</span><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"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax2', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax2',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'rewrite' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/term/getTerms.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,7 +221,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms_id_parent = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'id=>parent',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,11 +231,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id1 => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id2 => $term_id1,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $terms_id_parent
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $terms_id_parent
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms_ids = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,7 +245,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( $term_id1, $term_id2 ), $terms_ids );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms_name = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'names',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -250,7 +254,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( 'WOO!', 'HOO!' ), $terms_name );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms_id_name = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'id=>name',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -259,11 +264,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id1 => 'WOO!',
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id2 => 'HOO!',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $terms_id_name
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $terms_id_name
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms_id_slug = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'id=>slug',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,7 +279,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id1 => 'woo',
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id2 => 'hoo',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $terms_id_slug
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $terms_id_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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,7 +293,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id1 = self::factory()->tag->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id2 = self::factory()->tag->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $inc_terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'include' => array( $term_id1, $term_id2 ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,7 +302,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( $term_id1, $term_id2 ), wp_list_pluck( $inc_terms, 'term_id' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $exc_terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'exclude' => array( $term_id1, $term_id2 ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,7 +312,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // These should not generate query errors.
</span><span class="cx" style="display: block; padding: 0 10px"> get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'exclude' => array( 0 ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,7 +321,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $wpdb->last_error );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'exclude' => array( 'unexpected-string' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -318,7 +330,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $wpdb->last_error );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'include' => array( 'unexpected-string' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -333,13 +346,15 @@
</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><span class="cx" style="display: block; padding: 0 10px"> $terms = self::factory()->term->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_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">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'exclude_tree' => array( $terms[0] ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,7 +380,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id22 = self::factory()->category->create( array( 'parent' => $term_id2 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'category', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'category',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'exclude' => $term_id_uncategorized,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -374,7 +390,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( $term_id1, $term_id11, $term_id2, $term_id22 ), $terms );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'category', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'category',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'exclude_tree' => "$term_id1,$term_id_uncategorized",
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,7 +411,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id3 = self::factory()->tag->create( array( 'name' => 'Foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'search' => 'bur',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -421,7 +439,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name__like' => 'bur',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -430,7 +449,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( $term_id1 ), $terms );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms2 = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'description__like' => 'bur',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -439,7 +459,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( $term_id1, $term_id2 ), $terms2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms3 = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name__like' => 'Bur',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -448,7 +469,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( $term_id1 ), $terms3 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms4 = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'description__like' => 'Bur',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -457,7 +479,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( $term_id1, $term_id2 ), $terms4 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms5 = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name__like' => 'ENCHILADA',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,7 +489,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $terms5 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms6 = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'description__like' => 'ENCHILADA',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -475,7 +499,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $terms6 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms7 = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name__like' => 'o',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -484,7 +509,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( $term_id1, $term_id2 ), $terms7 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms8 = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'description__like' => '.',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -584,7 +610,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'cache_domain' => $tax,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -626,7 +653,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $term->count );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'cache_domain' => $tax,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -661,7 +689,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $term->count );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'cache_domain' => $tax,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -680,7 +709,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $child = self::factory()->category->create( array( 'parent' => $parent ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'category', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'category',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'child_of' => $parent,
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -701,7 +731,8 @@
</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><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'child_of' => $terms[0],
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -728,7 +759,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"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( 'wptests_tax1', 'wptests_tax2' ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 'wptests_tax1', 'wptests_tax2' ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'child_of' => $t2,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -799,7 +831,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $t2 = self::factory()->tag->create( array( 'slug' => 'bar' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -818,7 +851,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $t3 = self::factory()->tag->create( array( 'slug' => 'barry' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => array( 'foo', 'barry' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -836,7 +870,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $t2 = self::factory()->tag->create( array( 'name' => 'Bar' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -855,7 +890,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $t3 = self::factory()->tag->create( array( 'name' => 'Barry' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => array( 'Foo', 'Barry' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -880,7 +916,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"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo & Bar',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -890,7 +927,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // array format.
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => array( 'Foo & Bar' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -919,7 +957,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $name, $term->name );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => $name,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -956,7 +995,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $flat_tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $flat_tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'childless' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1048,7 +1088,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'childless' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1115,7 +1156,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'childless' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'child_of' => $quebec,
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1149,7 +1191,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"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( 'wptests_tax1', 'wptests_tax2' ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 'wptests_tax1', 'wptests_tax2' ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'childless' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1167,7 +1210,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = $this->create_hierarchical_terms_and_posts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1194,7 +1238,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = $this->create_hierarchical_terms_and_posts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1219,7 +1264,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = $this->create_hierarchical_terms_and_posts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1244,7 +1290,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = $this->create_hierarchical_terms_and_posts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'names',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1271,7 +1318,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = $this->create_hierarchical_terms_and_posts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'names',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1296,7 +1344,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = $this->create_hierarchical_terms_and_posts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'names',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1321,7 +1370,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = $this->create_hierarchical_terms_and_posts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'count',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1340,7 +1390,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = $this->create_hierarchical_terms_and_posts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'count',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1360,7 +1411,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = $this->create_hierarchical_terms_and_posts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'count',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1380,7 +1432,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = $this->create_hierarchical_terms_and_posts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'id=>parent',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1407,7 +1460,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = $this->create_hierarchical_terms_and_posts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'id=>parent',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1432,7 +1486,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = $this->create_hierarchical_terms_and_posts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'id=>parent',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1457,7 +1512,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = $this->create_hierarchical_terms_and_posts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'id=>slug',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1487,7 +1543,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = $this->create_hierarchical_terms_and_posts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'id=>slug',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1512,7 +1569,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = $this->create_hierarchical_terms_and_posts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'id=>slug',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1537,7 +1595,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = $this->create_hierarchical_terms_and_posts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'id=>name',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1567,7 +1626,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = $this->create_hierarchical_terms_and_posts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'id=>name',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1592,7 +1652,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = $this->create_hierarchical_terms_and_posts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'id=>name',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1650,7 +1711,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $t6, 'wptests_tax2' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( 'wptests_tax1', 'wptests_tax2' ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 'wptests_tax1', 'wptests_tax2' ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1686,7 +1748,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $t4 = self::factory()->term->create( array( 'taxonomy' => $tax ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'include' => array( $t4, $t1, $t2 ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'include',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1732,7 +1795,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"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'description',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1769,7 +1833,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"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'term_id',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1794,7 +1859,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Matches the first meta query clause.
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'relation' => 'AND',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1831,7 +1897,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Matches the first meta query clause.
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'relation' => 'AND',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1870,7 +1937,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[2], 'faa', 'zzz' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_key' => 'fee',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'meta_value',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1882,7 +1950,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( $terms[1], $terms[2], $terms[0] ), $found );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1901,7 +1970,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Matches the first meta query clause.
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'relation' => 'AND',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1925,7 +1995,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Matches the meta query clause corresponding to the 'meta_key' param.
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'relation' => 'AND',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1965,7 +2036,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[2], 'faa', '999' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_key' => 'fee',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'meta_value',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1977,7 +2049,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( $terms[1], $terms[2], $terms[0] ), $found );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1995,7 +2068,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( $terms[1], $terms[2], $terms[0] ), $found );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'relation' => 'AND',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2018,7 +2092,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( $terms[1], $terms[2], $terms[0] ), $found );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'relation' => 'AND',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2055,7 +2130,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[2], 'fee', 'zzz' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'relation' => 'AND',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2077,7 +2153,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( $terms[1], $terms[2], $terms[0] ), $found );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'relation' => 'AND',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2099,7 +2176,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( $terms[1], $terms[0], $terms[2] ), $found );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'relation' => 'AND',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2117,7 +2195,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"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'relation' => 'AND',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2143,7 +2222,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Case where hierarchical is false
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'category', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'category',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $initial_terms['one_term']['term_id'],
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2161,7 +2241,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Case where hierarchical is true
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'category', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'category',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $initial_terms['one_term']['term_id'],
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2187,7 +2268,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Case where hierarchical is false
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'category', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'category',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'child_of' => $initial_terms['one_term']['term_id'],
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2206,7 +2288,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Case where hierarchical is false
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'category', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'category',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'child_of' => $initial_terms['one_term']['term_id'],
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2221,7 +2304,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Case where hierarchical is true
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'category', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'category',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'child_of' => $initial_terms['one_term']['term_id'],
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2241,7 +2325,8 @@
</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><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'category', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'category',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'child_of' => $initial_terms['one_term']['term_id'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $initial_terms['one_term']['term_id'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2271,7 +2356,8 @@
</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><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $terms[0],
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2298,7 +2384,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"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( 'wptests_tax1', 'wptests_tax2' ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 'wptests_tax1', 'wptests_tax2' ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t2,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2313,7 +2400,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Case where hierarchical is false
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'category', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'category',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'child_of' => $initial_terms['one_term']['term_id'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $initial_terms['one_term']['term_id'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2332,7 +2420,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Case where hierarchical is true
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'category', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'category',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'child_of' => $initial_terms['one_term']['term_id'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $initial_terms['one_term']['term_id'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2376,7 +2465,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $posts[2], array( $t3 ), 'wptests_tax_1' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax_1', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax_1',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'pad_counts' => 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">@@ -2413,7 +2503,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $posts[2], $c3, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'category', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'category',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'pad_counts' => 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">@@ -2447,7 +2538,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $posts[2], $t3, 'wptests_tax2' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( 'wptests_tax1', 'wptests_tax2' ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 'wptests_tax1', 'wptests_tax2' ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'pad_counts' => 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">@@ -2478,7 +2570,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[2], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'include' => $terms,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2506,7 +2599,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[2], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'include' => $terms,
</span><span class="cx" style="display: block; padding: 0 10px"> 'update_term_meta_cache' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2534,7 +2628,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[3], 'foob', 'ar' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2559,7 +2654,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[0], 'foo', 'ber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2583,7 +2679,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = self::factory()->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'all',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2608,7 +2705,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prime the cache.
</span><span class="cx" style="display: block; padding: 0 10px"> get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'all',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2617,7 +2715,8 @@
</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><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'all',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2642,7 +2741,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = self::factory()->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'all',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2662,7 +2762,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'id=>parent',
</span><span class="cx" style="display: block; padding: 0 10px"> 'number' => 2,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2684,7 +2785,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = self::factory()->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'number' => 3,
</span><span class="cx" style="display: block; padding: 0 10px"> 'offset' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2703,7 +2805,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'number' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'offset' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2724,7 +2827,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = self::factory()->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'number' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'offset' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2745,7 +2849,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = self::factory()->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'number' => 100,
</span><span class="cx" style="display: block; padding: 0 10px"> 'offset' => 3,
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span></span></pre></div>
<a id="trunktestsphpunitteststermgetTheTermsphp"></a>
<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/getTheTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getTheTerms.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/term/getTheTerms.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // wp_get_object_terms() does not prime the cache.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id, $this->taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id,
+ $this->taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'names',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 't.term_id',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +66,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'My Amazing Tag', $terms[0]->description );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_updated = wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag_id, 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag_id,
+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'description' => 'This description is even more amazing!',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,7 +260,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create Test Category.
</span><span class="cx" style="display: block; padding: 0 10px"> $term_ids = self::factory()->term->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunktestsphpunitteststermmetaphp"></a>
<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/meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/meta.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/term/meta.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,7 +225,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prime cache.
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,7 +243,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[1], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,7 +267,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prime cache.
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +285,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_term_meta( $terms[1], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,7 +309,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prime cache.
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,7 +327,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> delete_term_meta( $terms[1], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/term/query.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -331,7 +331,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $query = new WP_Term_Query();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax_1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'object_ids' => $posts,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'all_with_object_id',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -462,7 +462,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_the_terms_should_respect_taxonomy_orderby() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'sort' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'term_order',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -470,7 +472,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"> $term_ids = self::factory()->term->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_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">@@ -489,7 +492,9 @@
</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_object_terms_should_respect_taxonomy_orderby() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'sort' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'args' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'term_order',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -497,7 +502,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"> $term_ids = self::factory()->term->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_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">@@ -541,7 +547,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, array( $t1, $t2 ), 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = wp_get_post_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => '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">@@ -548,7 +556,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found1 = array_keys(
</span><span class="cx" style="display: block; padding: 0 10px"> wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'id=>parent',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -556,7 +566,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found2 = array_keys(
</span><span class="cx" style="display: block; padding: 0 10px"> wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'id=>slug',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -564,7 +576,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found3 = array_keys(
</span><span class="cx" style="display: block; padding: 0 10px"> wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'id=>name',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -656,17 +670,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_null_term_object_should_be_discarded() {
</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">- $terms = self::factory()->term->create_many( 3, array(
- 'taxonomy' => 'wptests_tax',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::factory()->term->create_many(
+ 3,
+ array(
+ 'taxonomy' => 'wptests_tax',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->term_id = $terms[1];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'get_term', array( $this, 'filter_term_to_null' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $found = get_terms( array(
- 'taxonomy' => 'wptests_tax',
- 'hide_empty' => false,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found = get_terms(
+ array(
+ 'taxonomy' => 'wptests_tax',
+ 'hide_empty' => false,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'get_term', array( $this, 'filter_term_to_null' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array( $terms[0], $terms[2] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -688,17 +707,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_error_term_object_should_be_discarded() {
</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">- $terms = self::factory()->term->create_many( 3, array(
- 'taxonomy' => 'wptests_tax',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::factory()->term->create_many(
+ 3,
+ array(
+ 'taxonomy' => 'wptests_tax',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->term_id = $terms[1];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'get_term', array( $this, 'filter_term_to_wp_error' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $found = get_terms( array(
- 'taxonomy' => 'wptests_tax',
- 'hide_empty' => false,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found = get_terms(
+ array(
+ 'taxonomy' => 'wptests_tax',
+ 'hide_empty' => false,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'get_term', array( $this, 'filter_term_to_wp_error' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array( $terms[0], $terms[2] );
</span></span></pre></div>
<a id="trunktestsphpunitteststermsplitSharedTermphp"></a>
<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/splitSharedTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/splitSharedTerm.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/term/splitSharedTerm.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +26,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax_2', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax_2',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => 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">@@ -54,7 +56,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"> $t2_child = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Foo Child', 'wptests_tax_2', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Foo Child',
+ 'wptests_tax_2',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t1['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">@@ -89,7 +93,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_retain_child_terms_when_using_get_terms_parent() {
</span><span class="cx" style="display: block; padding: 0 10px"> $children = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax_2', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax_2',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $this->terms['t2']['term_id'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +108,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_retain_child_terms_when_using_get_terms_child_of() {
</span><span class="cx" style="display: block; padding: 0 10px"> $children = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax_2', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax_2',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'child_of' => $this->terms['t2']['term_id'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,7 +126,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax_3', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax_4', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax_4',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => 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">@@ -128,7 +136,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $t1 = wp_insert_term( 'Foo1', 'wptests_tax_3' );
</span><span class="cx" style="display: block; padding: 0 10px"> $t2 = wp_insert_term( 'Foo1 Parent', 'wptests_tax_4' );
</span><span class="cx" style="display: block; padding: 0 10px"> $t3 = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Foo1', 'wptests_tax_4', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Foo1',
+ 'wptests_tax_4',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t2['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">@@ -200,7 +210,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = wp_create_nav_menu( rand_str() );
</span><span class="cx" style="display: block; padding: 0 10px"> $cat_menu_item = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $t1['term_id'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,7 +277,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $t1 = wp_insert_term( 'Random term', 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> $cat_menu_item = wp_update_nav_menu_item(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $shared_term_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $shared_term_id,
+ 0,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $t1['term_id'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,7 +289,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Updating the menu will split the shared term.
</span><span class="cx" style="display: block; padding: 0 10px"> $new_nav_menu_id = wp_update_nav_menu_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $shared_term_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $shared_term_id,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'description' => 'Updated Foo Menu',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-name' => 'Updated Foo Menu',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/term/termExists.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_term_exists_taxonomy_nonempty_parent_nonempty_match_slug() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => 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">@@ -123,7 +125,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_term_exists_taxonomy_nonempty_parent_0_should_return_false_for_child_term() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => 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">@@ -151,7 +155,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_term_exists_taxonomy_nonempty_parent_nonempty_match_name() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => 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="trunktestsphpunitteststermwpDeleteTermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/wpDeleteTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpDeleteTerm.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/term/wpDeleteTerm.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,8 @@
</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><span class="cx" style="display: block; padding: 0 10px"> $terms = self::factory()->term->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/term/wpGenerateTagCloud.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,7 +83,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"> $found = wp_generate_tag_cloud(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tags, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tags,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => 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">@@ -104,7 +105,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"> $found = wp_generate_tag_cloud(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tags, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tags,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'format' => 'array',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,7 +128,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"> $found = wp_generate_tag_cloud(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tags, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tags,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'format' => 'list',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,7 +156,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"> $found = wp_generate_tag_cloud(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tags, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tags,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => 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">@@ -179,7 +183,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"> $found = wp_generate_tag_cloud(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tags, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tags,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'format' => 'list',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,11 +213,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term_objects = $this->retrieve_terms(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'include' => $term_ids,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'wptests_tax'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'wptests_tax'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_generate_tag_cloud(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_objects, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_objects,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'format' => 'array',
</span><span class="cx" style="display: block; padding: 0 10px"> 'topic_count_text' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'singular' => 'Term has %s post',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,11 +249,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term_objects = $this->retrieve_terms(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'include' => $term_ids,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), 'wptests_tax'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'wptests_tax'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_generate_tag_cloud(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_objects, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_objects,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'format' => 'array',
</span><span class="cx" style="display: block; padding: 0 10px"> 'topic_count_text_callback' => array( $this, 'topic_count_text_callback' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -267,7 +276,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $p, $term_ids, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term_objects = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'include' => $term_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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/term/wpGetObjectTerms.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // make sure they're correct
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id, $this->taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id,
+ $this->taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'slugs',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'term_id',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +50,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( $cat_id, $cat_id2 ), wp_list_pluck( $terms, 'term_id' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms2 = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( $post_id1, $post_id2 ), 'category', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( $post_id1, $post_id2 ),
+ 'category',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'all_with_object_id',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,7 +141,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, array( $t1, $t2, $t3 ), $this->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p, $this->taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p,
+ $this->taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'name',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,7 +179,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $posts[2], array( $t3 ), $this->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts[0], $this->taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts[0],
+ $this->taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'count',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,7 +215,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, array( $t1, $t2, $t3 ), $this->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p, $this->taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p,
+ $this->taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'slug',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,7 +254,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, array( $t1, $t2, $t3 ), $this->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p, $this->taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p,
+ $this->taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'term_group',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,19 +293,25 @@
</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"> $wpdb->update(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->term_relationships, array( 'term_order' => 1 ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->term_relationships,
+ array( 'term_order' => 1 ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'term_taxonomy_id' => $term_1->term_taxonomy_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object_id' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->term_relationships, array( 'term_order' => 3 ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->term_relationships,
+ array( 'term_order' => 3 ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'term_taxonomy_id' => $term_2->term_taxonomy_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object_id' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->term_relationships, array( 'term_order' => 2 ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->term_relationships,
+ array( 'term_order' => 2 ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'term_taxonomy_id' => $term_3->term_taxonomy_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object_id' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -300,7 +318,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"> $found = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p, $this->taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p,
+ $this->taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'term_order',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,7 +363,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update( $wpdb->term_taxonomy, array( 'parent' => 2 ), array( 'term_taxonomy_id' => $term_3->term_taxonomy_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p, $this->taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p,
+ $this->taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'parent',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -382,7 +404,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $t3, 'wptests_tax_2' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p, array( $this->taxonomy, 'wptests_tax_2', 'wptests_tax_3' ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p,
+ array( $this->taxonomy, 'wptests_tax_2', 'wptests_tax_3' ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -426,7 +450,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $set = wp_set_object_terms( $p, array( $t1, $t2, $t3 ), $this->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p, $this->taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p,
+ $this->taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'term_taxonomy_id',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -460,7 +486,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, array( $t1, $t2, $t3 ), $this->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p, $this->taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p,
+ $this->taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'name',
</span><span class="cx" style="display: block; padding: 0 10px"> 'order' => 'DESC',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -475,7 +503,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_parent() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax2', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax2',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => 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">@@ -508,7 +538,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, array( $t1, $t2, $t3, $t3 ), 'wptests_tax2' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p, 'wptests_tax2', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p,
+ 'wptests_tax2',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -549,7 +581,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, array( $t1, $t2, $t3, $t3 ), $this->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p, $this->taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p,
+ $this->taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -600,7 +634,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $terms, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'update_term_meta_cache' => 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">@@ -630,7 +666,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $terms, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'update_term_meta_cache' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'all_with_object_id',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -661,7 +699,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $terms, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'update_term_meta_cache' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -691,7 +731,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $terms, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -714,7 +756,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $t, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'all',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -735,7 +779,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $t, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'all_with_object_id',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -758,7 +804,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $t, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'all_with_object_id',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -778,7 +826,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $t, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'all_with_object_id',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -806,10 +856,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $t2, 'wptests_tax2' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wptests_tax1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wptests_tax2',
</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(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'all_with_object_id',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -833,7 +885,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $posts[1], $t, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'all_with_object_id',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -937,7 +991,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array( $term_1_id, $term_2_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id, array( $taxonomy1, $taxonomy2 ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id,
+ array( $taxonomy1, $taxonomy2 ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'term_id',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/term/wpInsertTerm.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,7 +78,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_parent_does_not_exist() {
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo', 'post_tag', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo',
+ 'post_tag',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 999999,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +102,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_unslash_description() {
</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"> $found = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Quality', 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Quality',
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'description' => 'Let\\\'s all say \\"Hooray\\" for WordPress 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">@@ -114,7 +118,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_parent_string() {
</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"> $found = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Quality', 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Quality',
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 'foo1',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,7 +135,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_slug_empty_string() {
</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"> $found = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Quality', 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Quality',
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +152,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_slug_whitespace_string() {
</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"> $found = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Quality', 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Quality',
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => ' ',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,7 +168,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_slug_0() {
</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"> $found = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Quality', 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Quality',
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 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">@@ -259,7 +271,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"> $t2 = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Foo', 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Foo',
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -290,7 +304,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"> $t3 = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Foo', 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Foo',
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,7 +329,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"> $t2 = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Foo', 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Foo',
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo-unique',
</span><span class="cx" style="display: block; padding: 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,7 +376,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"> $t2 = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Foo', 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Foo',
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -389,7 +409,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"> $t3 = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Foo', 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Foo',
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 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,7 +445,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"> $t4 = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Foo', 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Foo',
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -478,19 +502,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $t1_child = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Child', 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Child',
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t1,
</span><span class="cx" style="display: block; 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"> $t2_child = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Child', 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Child',
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t2,
</span><span class="cx" style="display: block; 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"> $error = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Child', 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Child',
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t2,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -514,7 +544,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"> $t2 = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Foo', 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Foo',
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo-unique',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -560,7 +592,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $t, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $created = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Foo 2', 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Foo 2',
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -588,7 +622,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $t, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $created = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Foo 2', 'wptests_tax_2', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Foo 2',
+ 'wptests_tax_2',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -622,7 +658,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $t, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $created = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Foo 2', 'wptests_tax_2', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Foo 2',
+ 'wptests_tax_2',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -651,7 +689,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term_1 = get_term( $t1, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $created_term_ids = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Foo', 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Foo',
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'alias_of' => $term_1->slug,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -685,7 +725,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term_2 = get_term( $t2, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $created_term_ids = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Foo', 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Foo',
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'alias_of' => $term_2->slug,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -699,7 +741,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_alias_of_nonexistent_term() {
</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"> $created_term_ids = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Foo', 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Foo',
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'alias_of' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -742,7 +786,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_should_clean_term_cache() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => 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">@@ -763,7 +809,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( 'get', array( 1, 2, 3 ), 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo', 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo',
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -836,7 +884,9 @@
</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><span class="cx" style="display: block; padding: 0 10px"> $term = wp_insert_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo', 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'foo',
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'description' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/term/wpSetObjectTerms.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,7 +271,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // make sure they're correct
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id, $this->taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id,
+ $this->taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'term_id',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -284,7 +286,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // make sure they're correct
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id, $this->taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id,
+ $this->taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'term_id',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,7 +314,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // make sure they're correct
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id, $this->taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id,
+ $this->taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'names',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'term_id',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,7 +329,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // make sure they're correct
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id, $this->taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id,
+ $this->taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'names',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'term_id',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpTaxonomyphp"></a>
<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/wpTaxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpTaxonomy.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/term/wpTaxonomy.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy_object = new WP_Taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy, 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $taxonomy,
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'rewrite' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'query_var' => 'foobar',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +60,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy_object = new WP_Taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy, 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $taxonomy,
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'rewrite' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +81,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_adds_ajax_callback() {
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy_object = new WP_Taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy, 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $taxonomy,
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'rewrite' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpTermphp"></a>
<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/wpTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpTerm.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/term/wpTerm.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,13 +19,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Ensure that there is a term with ID 1.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! get_term( 1 ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->terms, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->terms,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'term_id' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->term_taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->term_taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'term_id' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpUpdateTermphp"></a>
<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/wpUpdateTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpUpdateTerm.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/term/wpUpdateTerm.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,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"> $found = wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Let\\\'s all say \\"Hooray\\" for WordPress 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">@@ -47,7 +49,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"> $found = wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'description' => 'Let\\\'s all say \\"Hooray\\" for WordPress 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">@@ -67,7 +71,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"> $found = wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t,
+ 'wptests_tax',
+ array(
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +88,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_update_term_parent_does_not_exist() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => 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">@@ -97,7 +104,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"> $found = wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $fake_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">@@ -120,7 +129,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"> $found = wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +150,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"> $found = wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo Bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,7 +172,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"> $found = wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo-bar',
</span><span class="cx" style="display: block; padding: 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 +207,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"> $updated = wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,7 +242,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"> $updated = wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2, 'wptests_tax_2', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2,
+ 'wptests_tax_2',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,7 +280,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"> $updated = wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2, 'wptests_tax_2', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2,
+ 'wptests_tax_2',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -277,7 +298,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_update_term_should_allow_duplicate_names_at_different_levels_of_the_same_taxonomy() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => 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">@@ -309,7 +332,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"> $updated = wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t3, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t3,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Bar',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,7 +376,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $t1_terms[0]->term_id, $t2_terms[0]->term_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2_terms[0]->term_id, 'wptests_tax_2', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2_terms[0]->term_id,
+ 'wptests_tax_2',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'New Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -372,7 +399,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $created_term_ids = wp_insert_term( 'Foo', 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $created_term_ids['term_id'], 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $created_term_ids['term_id'],
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'alias_of' => $term_1->slug,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -405,7 +434,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $created_term_ids = wp_insert_term( 'Foo', 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $created_term_ids['term_id'], 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $created_term_ids['term_id'],
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'alias_of' => $term_2->slug,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -420,7 +451,9 @@
</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"> $created_term_ids = wp_insert_term( 'Foo', 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $created_term_ids['term_id'], 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $created_term_ids['term_id'],
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'alias_of' => 'bar',
</span><span class="cx" style="display: block; padding: 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 +473,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"> $found = wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -468,7 +503,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"> $found = wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo? Bar!', // Will sanitize to 'foo-bar'.
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -483,7 +520,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_update_term_duplicate_slug_with_changed_parent() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => 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">@@ -505,7 +544,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"> $found = wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo-bar',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -535,7 +576,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"> $found = wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo-bar',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -556,7 +599,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"> $found = wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -586,7 +631,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"> $found = wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -597,7 +644,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_update_term_should_clean_term_cache() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => 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">@@ -623,7 +672,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( 'get', array( 1, 2, 3 ), 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t2,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -642,12 +693,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_update_term_should_assign_new_slug_when_reassigning_parent_as_long_as_there_is_no_other_term_with_the_same_slug() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => 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"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax_2', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax_2',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => 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">@@ -667,7 +722,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"> wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t1,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -684,12 +741,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_update_term_should_not_assign_new_slug_when_reassigning_parent_as_long_as_there_is_no_other_slug_conflict_within_the_taxonomy() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => 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"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax_2', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax_2',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => 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">@@ -717,7 +778,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"> wp_update_term(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t3, 'wptests_tax', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t3,
+ 'wptests_tax',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t1,
</span><span 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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/term.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_delete_term_should_invalidate_cache_for_child_terms() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wptests_tax', 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wptests_tax',
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,7 +196,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> private function assertPostHasTerms( $post_id, $expected_term_ids, $taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $assigned_term_ids = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id, $taxonomy, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id,
+ $taxonomy,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => '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="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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/theme/WPTheme.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,7 +181,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $new_allowed_themes = get_site_option( 'allowedthemes' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_site_option( 'allowedthemes', $current_allowed_themes ); // reset previous value.
</span><span class="cx" style="display: block; padding: 0 10px"> $current_allowed_themes = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_allowed_themes, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_allowed_themes,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'testtheme-2' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'testtheme-3' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunktestsphpunitteststhemecustomHeaderphp"></a>
<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/customHeader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/customHeader.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/theme/customHeader.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -359,7 +359,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $_wp_theme_features;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_wp_theme_features['custom-header'][0] = wp_parse_args(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default-image' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'random-default' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 0,
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/theme.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -324,7 +324,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_keep_alive_customize_changeset_dependent_auto_drafts() {
</span><span class="cx" style="display: block; padding: 0 10px"> $nav_created_post_ids = $this->factory()->post->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'auto-draft',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => gmdate( 'Y-m-d H:i:s', strtotime( '-2 days' ) ),
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/user/author.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +93,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'wptests_pt' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cpt_ids = self::factory()->post->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => self::$author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'wptests_pt',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/user/capabilities.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -880,7 +880,9 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $role_name, 'Janitor', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $role_name,
+ 'Janitor',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'level_1' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'sweep_floor' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'polish_doorknobs' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1100,7 +1102,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'draw_somethings', $something->cap->create_posts );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'something', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'something',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'capabilities' =>
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit_posts' => 'draw_somethings',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1306,7 +1309,9 @@
</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="cx" style="display: block; padding: 0 10px"> $primitive_cap,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $caps, "Meta cap: {$meta_cap}"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $caps,
+ "Meta cap: {$meta_cap}"
</ins><span class="cx" style="display: block; 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">@@ -1398,7 +1403,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = 'custom_cap_taxo';
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy, 'post', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $taxonomy,
+ 'post',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'capabilities' => $expected,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1411,7 +1418,9 @@
</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="cx" style="display: block; padding: 0 10px"> $primitive_cap,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $caps, "Meta cap: {$meta_cap}"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $caps,
+ "Meta cap: {$meta_cap}"
</ins><span class="cx" style="display: block; 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">@@ -1714,7 +1723,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_cpt_with_page_capability_type() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'page_capability', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'page_capability',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'capability_type' => '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">@@ -1925,7 +1935,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $role_name = 'uploader';
</span><span class="cx" style="display: block; padding: 0 10px"> add_role(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $role_name, 'Uploader', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $role_name,
+ 'Uploader',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'read' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'upload_files' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1953,7 +1965,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $role_name = 'uploader';
</span><span class="cx" style="display: block; padding: 0 10px"> add_role(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $role_name, 'Uploader', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $role_name,
+ 'Uploader',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'read' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'upload_files' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2020,7 +2034,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $role_name = 'uploader';
</span><span class="cx" style="display: block; padding: 0 10px"> add_role(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $role_name, 'Uploader', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $role_name,
+ 'Uploader',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'read' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'upload_files' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunktestsphpunittestsusercountUserPostsphp"></a>
<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/countUserPosts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/countUserPosts.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/user/countUserPosts.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,14 +18,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"> self::$post_ids = $factory->post->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 4, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 4,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => self::$user_id,
</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><span class="cx" style="display: block; padding: 0 10px"> self::$post_ids = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$post_ids, $factory->post->create_many(
- 3, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$post_ids,
+ $factory->post->create_many(
+ 3,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => self::$user_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'wptests_pt',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,8 +35,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"> self::$post_ids = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$post_ids, $factory->post->create_many(
- 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$post_ids,
+ $factory->post->create_many(
+ 2,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => 12345,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'wptests_pt',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/user/countUsers.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,7 +61,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'contributor' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'subscriber' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'none' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $count['avail_roles']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $count['avail_roles']
</ins><span class="cx" style="display: block; 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">@@ -140,7 +141,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'contributor' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'subscriber' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'none' => 2,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $count['avail_roles']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $count['avail_roles']
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test users counts on blog 1
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +156,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'administrator' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'editor' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'none' => 0,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $count['avail_roles']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $count['avail_roles']
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test users counts on blog 2
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,7 +171,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'administrator' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'contributor' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'none' => 0,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $count['avail_roles']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $count['avail_roles']
</ins><span class="cx" style="display: block; 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">@@ -197,7 +201,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'tester' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'none' => 0,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $count['avail_roles']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $count['avail_roles']
</ins><span class="cx" style="display: block; 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">@@ -226,7 +231,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'editor',
</span><span class="cx" style="display: block; padding: 0 10px"> 'author',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), get_userdata( $editor )->roles
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ get_userdata( $editor )->roles
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test user counts
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -239,7 +245,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'editor' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'author' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'none' => 0,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $count['avail_roles']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $count['avail_roles']
</ins><span class="cx" style="display: block; 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">@@ -263,7 +270,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Manually delete the user, but leave the capabilities usermeta.
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->delete(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->users, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->users,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'ID' => $u,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunktestsphpunittestsuserlistAuthorsphp"></a>
<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/listAuthors.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/listAuthors.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/user/listAuthors.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +82,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_list_authors_orderby() {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['post_count'] = '<li><a href="' . self::$user_urls[0] . '" title="Posts by zack">zack</a></li><li><a href="' . self::$user_urls[1] . '" title="Posts by bob">bob</a></li><li><a href="' . self::$user_urls[2] . '" title="Posts by paul">paul</a></li>';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->AssertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected['post_count'], wp_list_authors(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected['post_count'],
+ wp_list_authors(
</ins><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="cx" style="display: block; padding: 0 10px"> 'orderby' => 'post_count',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +95,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_list_authors_order() {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['id'] = '<li><a href="' . self::$user_urls[2] . '" title="Posts by paul">paul</a></li><li><a href="' . self::$user_urls[1] . '" title="Posts by bob">bob</a></li><li><a href="' . self::$user_urls[0] . '" title="Posts by zack">zack</a></li>';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->AssertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected['id'], wp_list_authors(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected['id'],
+ wp_list_authors(
</ins><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="cx" style="display: block; padding: 0 10px"> 'orderby' => 'id',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +109,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_list_authors_optioncount() {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['optioncount'] = '<li><a href="' . self::$user_urls[1] . '" title="Posts by bob">bob</a> (2)</li><li><a href="' . self::$user_urls[2] . '" title="Posts by paul">paul</a> (3)</li><li><a href="' . self::$user_urls[0] . '" title="Posts by zack">zack</a> (1)</li>';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->AssertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected['optioncount'], wp_list_authors(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected['optioncount'],
+ wp_list_authors(
</ins><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="cx" style="display: block; padding: 0 10px"> 'optioncount' => 1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,7 +128,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['exclude_admin'] = '<li><a href="' . get_author_posts_url( 1 ) . '" title="Posts by admin">admin</a></li><li><a href="' . self::$user_urls[1] . '" title="Posts by bob">bob</a></li><li><a href="' . self::$user_urls[2] . '" title="Posts by paul">paul</a></li><li><a href="' . self::$user_urls[0] . '" title="Posts by zack">zack</a></li>';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->AssertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected['exclude_admin'], wp_list_authors(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected['exclude_admin'],
+ wp_list_authors(
</ins><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="cx" style="display: block; padding: 0 10px"> 'exclude_admin' => 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,7 +141,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_list_authors_show_fullname() {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['show_fullname'] = '<li><a href="' . self::$user_urls[1] . '" title="Posts by bob">bob reno</a></li><li><a href="' . self::$user_urls[2] . '" title="Posts by paul">paul norris</a></li><li><a href="' . self::$user_urls[0] . '" title="Posts by zack">zack moon</a></li>';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->AssertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected['show_fullname'], wp_list_authors(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected['show_fullname'],
+ wp_list_authors(
</ins><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="cx" style="display: block; padding: 0 10px"> 'show_fullname' => 1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,7 +155,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $fred_id = self::$fred_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['hide_empty'] = '<li><a href="' . self::$user_urls[1] . '" title="Posts by bob">bob</a></li><li><a href="' . get_author_posts_url( $fred_id ) . '" title="Posts by fred">fred</a></li><li><a href="' . self::$user_urls[2] . '" title="Posts by paul">paul</a></li><li><a href="' . self::$user_urls[0] . '" title="Posts by zack">zack</a></li>';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->AssertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected['hide_empty'], wp_list_authors(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected['hide_empty'],
+ wp_list_authors(
</ins><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="cx" style="display: block; padding: 0 10px"> 'hide_empty' => 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +177,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url2 = get_author_feed_link( self::$user_ids[2] );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['feed'] = '<li><a href="' . self::$user_urls[1] . '" title="Posts by bob">bob</a> (<a href="' . $url1 . '">link to feed</a>)</li><li><a href="' . self::$user_urls[2] . '" title="Posts by paul">paul</a> (<a href="' . $url2 . '">link to feed</a>)</li><li><a href="' . self::$user_urls[0] . '" title="Posts by zack">zack</a> (<a href="' . $url0 . '">link to feed</a>)</li>';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->AssertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected['feed'], wp_list_authors(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected['feed'],
+ wp_list_authors(
</ins><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="cx" style="display: block; padding: 0 10px"> 'feed' => 'link to feed',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -186,7 +193,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url2 = get_author_feed_link( self::$user_ids[2] );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['feed_image'] = '<li><a href="' . self::$user_urls[1] . '" title="Posts by bob">bob</a> <a href="' . $url1 . '"><img src="http://' . WP_TESTS_DOMAIN . '/path/to/a/graphic.png" style="border: none;" /></a></li><li><a href="' . self::$user_urls[2] . '" title="Posts by paul">paul</a> <a href="' . $url2 . '"><img src="http://' . WP_TESTS_DOMAIN . '/path/to/a/graphic.png" style="border: none;" /></a></li><li><a href="' . self::$user_urls[0] . '" title="Posts by zack">zack</a> <a href="' . $url0 . '"><img src="http://' . WP_TESTS_DOMAIN . '/path/to/a/graphic.png" style="border: none;" /></a></li>';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->AssertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected['feed_image'], wp_list_authors(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected['feed_image'],
+ wp_list_authors(
</ins><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="cx" style="display: block; padding: 0 10px"> 'feed_image' => WP_TESTS_DOMAIN . '/path/to/a/graphic.png',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,7 +212,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url2 = get_author_feed_link( self::$user_ids[2], 'atom' );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['feed_type'] = '<li><a href="' . self::$user_urls[1] . '" title="Posts by bob">bob</a> (<a href="' . $url1 . '">link to feed</a>)</li><li><a href="' . self::$user_urls[2] . '" title="Posts by paul">paul</a> (<a href="' . $url2 . '">link to feed</a>)</li><li><a href="' . self::$user_urls[0] . '" title="Posts by zack">zack</a> (<a href="' . $url0 . '">link to feed</a>)</li>';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->AssertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected['feed_type'], wp_list_authors(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected['feed_type'],
+ wp_list_authors(
</ins><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="cx" style="display: block; padding: 0 10px"> 'feed' => 'link to feed',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,7 +226,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_list_authors_style() {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['style'] = '<a href="' . self::$user_urls[1] . '" title="Posts by bob">bob</a>, <a href="' . self::$user_urls[2] . '" title="Posts by paul">paul</a>, <a href="' . self::$user_urls[0] . '" title="Posts by zack">zack</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->AssertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected['style'], wp_list_authors(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected['style'],
+ wp_list_authors(
</ins><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="cx" style="display: block; padding: 0 10px"> 'style' => 'none',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -229,7 +239,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_list_authors_html() {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['html'] = 'bob, paul, zack';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->AssertEquals(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected['html'], wp_list_authors(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected['html'],
+ wp_list_authors(
</ins><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="cx" style="display: block; padding: 0 10px"> 'html' => 0,
</span></span></pre></div>
<a id="trunktestsphpunittestsusermapMetaCapphp"></a>
<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/mapMetaCap.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/mapMetaCap.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/user/mapMetaCap.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_capability_type_post_with_no_extra_caps() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$post_type, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$post_type,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'capability_type' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +90,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_custom_capability_type_with_map_meta_cap() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$post_type, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$post_type,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'capability_type' => 'book',
</span><span class="cx" style="display: block; padding: 0 10px"> 'map_meta_cap' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,7 +129,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_capability_type_post_with_one_renamed_cap() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$post_type, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$post_type,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'capability_type' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'capabilities' => array( 'edit_posts' => 'edit_books' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,7 +170,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_capability_type_post_map_meta_cap_true_with_renamed_cap() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$post_type, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$post_type,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'capability_type' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'map_meta_cap' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'capabilities' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,7 +215,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_capability_type_post_with_all_meta_caps_renamed() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$post_type, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$post_type,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'capability_type' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'capabilities' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit_post' => 'edit_book',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,7 +260,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_capability_type_post_with_all_meta_caps_renamed_mapped() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$post_type, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$post_type,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'capability_type' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'map_meta_cap' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'capabilities' => array(
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/user/query.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,19 +15,22 @@
</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><span class="cx" style="display: block; padding: 0 10px"> self::$author_ids = $factory->user->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 4, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 4,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'author',
</span><span class="cx" style="display: block; 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"> self::$sub_ids = $factory->user->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'subscriber',
</span><span class="cx" style="display: block; 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"> self::$editor_ids = $factory->user->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 3, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 3,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'editor',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +42,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"> self::$admin_ids = $factory->user->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'administrator',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunktestsphpunittestsuserwpGetUsersWithNoRolephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user/wpGetUsersWithNoRole.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/wpGetUsersWithNoRole.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/user/wpGetUsersWithNoRole.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> $nobody,
</span><span class="cx" style="display: block; padding: 0 10px"> $nobody_else,
</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"> );
</span><span class="cx" style="display: block; padding: 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,7 +84,8 @@
</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="cx" style="display: block; padding: 0 10px"> "{$nobody}",
</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"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test users counts on blog 1
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +100,8 @@
</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="cx" style="display: block; padding: 0 10px"> "{$admin}",
</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"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/user.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -906,7 +906,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_user_should_not_truncate_to_a_duplicate_user_nicename_when_suffix_has_more_than_one_character() {
</span><span class="cx" style="display: block; padding: 0 10px"> $user_ids = self::factory()->user->create_many(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 4, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 4,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_nicename' => str_repeat( 'a', 50 ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1556,7 +1557,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['role'] = 'subscriber';
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['email'] = 'subscriber@subscriber.test';
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['nickname'] = 'subscriber';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $administrator, edit_user( $administrator ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $administrator, edit_user( $administrator ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Should still have the old role.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'administrator' ), get_userdata( $administrator )->roles );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1571,7 +1572,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['role'] = 'administrator';
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['email'] = 'administrator@administrator.test';
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['nickname'] = 'administrator';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $editor, edit_user( $editor ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $editor, edit_user( $editor ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Should have the new role.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'administrator' ), get_userdata( $editor )->roles );
</span></span></pre></div>
<a id="trunktestsphpunittestswidgetscustomhtmlwidgetphp"></a>
<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/custom-html-widget.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets/custom-html-widget.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/widgets/custom-html-widget.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +92,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Convert Custom HTML widget instance into Text widget instance data.
</span><span class="cx" style="display: block; padding: 0 10px"> $text_widget_instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'text' => $instance['content'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'filter' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'visual' => false,
</span></span></pre></div>
<a id="trunktestsphpunittestswidgetsmediaaudiowidgetphp"></a>
<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/media-audio-widget.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets/media-audio-widget.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/widgets/media-audio-widget.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +74,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'no_media_selected',
</span><span class="cx" style="display: block; padding: 0 10px"> 'add_media',
</span><span class="cx" style="display: block; padding: 0 10px"> 'unsupported_file_type',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), array_keys( $widget->l10n )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array_keys( $widget->l10n )
</ins><span class="cx" style="display: block; 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">@@ -98,7 +99,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'attachment_id' => 'media',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,7 +115,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => 'not_a_url',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringStartsWith( 'http://', $result['url'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,7 +132,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'loop' => 'not-boolean',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +148,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => '<h1>Cute Baby Goats</h1>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,7 +164,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'preload' => 'nope',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,7 +173,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'h4x' => 'value',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestswidgetsmediaimagewidgetphp"></a>
<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/media-image-widget.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets/media-image-widget.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/widgets/media-image-widget.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'title',
</span><span class="cx" style="display: block; padding: 0 10px"> 'url',
</span><span class="cx" style="display: block; padding: 0 10px"> 'width',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), array_keys( $schema )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array_keys( $schema )
</ins><span class="cx" style="display: block; 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">@@ -80,7 +81,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'no_media_selected',
</span><span class="cx" style="display: block; padding: 0 10px"> 'add_media',
</span><span class="cx" style="display: block; padding: 0 10px"> 'unsupported_file_type',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), array_keys( $widget->l10n )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array_keys( $widget->l10n )
</ins><span class="cx" style="display: block; 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">@@ -104,7 +106,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'attachment_id' => 'media',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,7 +122,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => 'not_a_url',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringStartsWith( 'http://', $result['url'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +139,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => '<h1>W00t!</h1>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,7 +155,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'size' => 'big league',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,7 +171,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 'wide',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,7 +187,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => 'high',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,10 +203,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'caption' => '"><i onload="alert(\'hello\')" />',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'caption' => '"><i />',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,10 +224,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'alt' => '"><i onload="alert(\'hello\')" />',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> '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">@@ -233,7 +245,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_type' => 'interesting',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -248,7 +261,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_url' => 'not_a_url',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringStartsWith( 'http://', $result['link_url'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -264,10 +278,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'image_classes' => '"><i onload="alert(\'hello\')" />',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'image_classes' => 'i onloadalerthello',
</span><span class="cx" style="display: block; padding: 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,10 +299,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_classes' => '"><i onload="alert(\'hello\')" />',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'link_classes' => 'i onloadalerthello',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,10 +320,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_rel' => '"><i onload="alert(\'hello\')" />',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'link_rel' => 'i onloadalerthello',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,7 +341,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_target_blank' => 'top',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -336,7 +357,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'image_title' => '<h1>W00t!</h1>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -344,7 +366,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'imaginary_key' => 'value',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestswidgetsmediavideowidgetphp"></a>
<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/media-video-widget.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets/media-video-widget.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/widgets/media-video-widget.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'missing_attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'no_media_selected',
</span><span class="cx" style="display: block; padding: 0 10px"> 'add_media',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), array_keys( $widget->l10n )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array_keys( $widget->l10n )
</ins><span class="cx" style="display: block; 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">@@ -99,7 +100,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'attachment_id' => 'media',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,7 +116,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => 'not_a_url',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringStartsWith( 'http://', $result['url'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +133,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'loop' => 'not-boolean',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,7 +149,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => '<h1>Cute Baby Goats</h1>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,7 +165,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'preload' => 'nope',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,7 +174,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'h4x' => 'value',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $instance
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $instance
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $result, $instance );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestswidgetsmediawidgetphp"></a>
<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/media-widget.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets/media-widget.php 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/widgets/media-widget.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +73,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'no_media_selected',
</span><span class="cx" style="display: block; padding: 0 10px"> 'add_media',
</span><span class="cx" style="display: block; padding: 0 10px"> 'unsupported_file_type',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), array_keys( $widget->l10n )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array_keys( $widget->l10n )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( count( $widget->l10n ), count( array_filter( $widget->l10n ) ), 'Expected all translation strings to be defined.' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 10, has_action( 'admin_print_scripts-widgets.php', array( $widget, 'enqueue_admin_scripts' ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,7 +212,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'attachment_id',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title',
</span><span class="cx" style="display: block; padding: 0 10px"> 'url',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), array_keys( $schema )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array_keys( $schema )
</ins><span class="cx" style="display: 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 filter usage.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -496,7 +498,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $has_content->setAccessible( true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $has_content->invokeArgs(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->get_mocked_class_instance(), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->get_mocked_class_instance(),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'attachment_id' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -506,7 +509,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $result );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $has_content->invokeArgs(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->get_mocked_class_instance(), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->get_mocked_class_instance(),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'attachment_id' => $attachment_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -516,7 +520,8 @@
</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"> $result = $has_content->invokeArgs(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->get_mocked_class_instance(), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->get_mocked_class_instance(),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'attachment_id' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => 'http://example.com/image.jpg',
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/widgets/text-widget.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +188,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'filter' => 'content',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected_instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'filter' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'visual' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,7 +335,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Legacy Text Widget without wpautop.
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $base_instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $base_instance,
+ array(
</ins><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"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -350,7 +352,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Legacy Text Widget with wpautop.
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $base_instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $base_instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'filter' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'visual' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -378,7 +381,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'widget_text', 'do_shortcode' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $base_instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $base_instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'filter' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'visual' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -469,7 +473,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"> $instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $base_instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $base_instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'visual' => 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">@@ -476,7 +481,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $widget->is_legacy_instance( $instance ), 'Legacy when visual=false prop is present.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $base_instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $base_instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'visual' => 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">@@ -483,7 +489,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $widget->is_legacy_instance( $instance ), 'Not legacy when visual=true prop is present.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $base_instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $base_instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'filter' => 'content',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -490,7 +497,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $widget->is_legacy_instance( $instance ), 'Not legacy when filter is explicitly content (in WP 4.8.0 only).' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $base_instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $base_instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'text' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'filter' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -498,7 +506,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $widget->is_legacy_instance( $instance ), 'Not legacy when text is empty.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $base_instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $base_instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'text' => "\nOne line",
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -506,7 +515,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $widget->is_legacy_instance( $instance ), 'Not legacy when there is leading whitespace.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $base_instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $base_instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'text' => "\nOne line\n\n",
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -514,7 +524,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $widget->is_legacy_instance( $instance ), 'Not legacy when there is trailing whitespace.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $base_instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $base_instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'text' => "One\nTwo",
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -522,7 +533,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $widget->is_legacy_instance( $instance ), 'Legacy when not-wpautop and there are line breaks.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $base_instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $base_instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'text' => "One\n\nTwo",
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -530,7 +542,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $widget->is_legacy_instance( $instance ), 'Legacy when not-wpautop and there are paragraph breaks.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $base_instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $base_instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'text' => "One\nTwo",
</span><span class="cx" style="display: block; padding: 0 10px"> 'filter' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -538,7 +551,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $widget->is_legacy_instance( $instance ), 'Not automatically legacy when wpautop and there are line breaks.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $base_instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $base_instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'text' => "One\n\nTwo",
</span><span class="cx" style="display: block; padding: 0 10px"> 'filter' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -546,7 +560,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $widget->is_legacy_instance( $instance ), 'Not automatically legacy when wpautop and there are paragraph breaks.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $base_instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $base_instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'text' => 'Test<!-- comment -->',
</span><span class="cx" style="display: block; padding: 0 10px"> 'filter' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -568,7 +583,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $legacy_text_examples as $legacy_text_example ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $base_instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $base_instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'text' => $legacy_text_example,
</span><span class="cx" style="display: block; padding: 0 10px"> 'filter' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -576,7 +592,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $widget->is_legacy_instance( $instance ), 'Legacy when wpautop and there is HTML that is not liable to be mutated.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $base_instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $base_instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'text' => $legacy_text_example,
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -597,7 +614,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $migratable_text_examples as $migratable_text_example ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $base_instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $base_instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'text' => $migratable_text_example,
</span><span class="cx" style="display: block; padding: 0 10px"> 'filter' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -764,12 +782,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'visual' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $old_instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $instance,
+ array(
</ins><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"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'filter' => 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,13 +803,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'filter' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $old_instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'visual' => 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"> $result = $widget->update( $instance, $old_instance );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'visual' => 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">@@ -801,13 +823,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'text' => 'Text',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $old_instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'visual' => 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"> $result = $widget->update( $instance, $old_instance );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'visual' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'filter' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -821,7 +845,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'visual' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'filter' => 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">@@ -836,7 +861,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update( $instance, array() );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $instance,
+ array(
</ins><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"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -849,7 +875,8 @@
</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"> $old_instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'visual' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'filter' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -856,7 +883,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update( $instance, $old_instance );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'visual' => false,
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -871,7 +899,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update( $instance, array() );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'filter' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'visual' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -884,13 +913,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'text' => 'Text',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $old_instance = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'filter' => 'content',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update( $instance, $old_instance );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'visual' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'filter' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -905,7 +936,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $widget->update( $instance, array() );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array_merge(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $instance, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $instance,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'filter' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'visual' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/widgets.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,19 +56,22 @@
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'widget_search', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'widget_search',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 2 => array( 'title' => '' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '_multiwidget' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'widget_better_search', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'widget_better_search',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 3 => array( 'title' => '' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '_multiwidget' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'widget_best_search', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'widget_best_search',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 4 => array( 'title' => '' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '_multiwidget' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -733,7 +736,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test restoring sidebars widgets when previously activated.
</span><span class="cx" style="display: block; padding: 0 10px"> set_theme_mod(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'sidebars_widgets', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'sidebars_widgets',
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'time' => time(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'data' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'sidebar-1' => array( 'tag_cloud-1' ),
</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 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getPosts.php 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,7 +47,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cpt_name = 'test_wp_getposts_cpt';
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cpt_name, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cpt_name,
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomies' => array( 'post_tag', 'category' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunktestsqunitfixtureswpapigeneratedjs"></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-generated.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/fixtures/wp-api-generated.js 2018-08-15 19:49:50 UTC (rev 43570)
+++ trunk/tests/qunit/fixtures/wp-api-generated.js 2018-08-17 01:50:26 UTC (rev 43571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4286,7 +4286,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "taxonomy": "category",
</span><span class="cx" style="display: block; padding: 0 10px"> "parent": 0,
</span><span class="cx" style="display: block; padding: 0 10px"> "meta": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "meta_key": ""
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "test_single": "",
+ "test_multi": [],
+ "meta_key": "",
+ "test_cat_single": "",
+ "test_cat_multi": []
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "_links": {
</span><span class="cx" style="display: block; padding: 0 10px"> "self": [
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4330,7 +4334,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "taxonomy": "category",
</span><span class="cx" style="display: block; padding: 0 10px"> "parent": 0,
</span><span class="cx" style="display: block; padding: 0 10px"> "meta": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "meta_key": ""
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "test_single": "",
+ "test_multi": [],
+ "meta_key": "",
+ "test_cat_single": "",
+ "test_cat_multi": []
</ins><span class="cx" style="display: block; 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">@@ -4344,7 +4352,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "slug": "restapi-client-fixture-tag",
</span><span class="cx" style="display: block; padding: 0 10px"> "taxonomy": "post_tag",
</span><span class="cx" style="display: block; padding: 0 10px"> "meta": {
</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">+ "test_single": "",
+ "test_multi": [],
+ "meta_key": "meta_value",
+ "test_tag_meta": ""
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "_links": {
</span><span class="cx" style="display: block; padding: 0 10px"> "self": [
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4387,7 +4398,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "slug": "restapi-client-fixture-tag",
</span><span class="cx" style="display: block; padding: 0 10px"> "taxonomy": "post_tag",
</span><span class="cx" style="display: block; padding: 0 10px"> "meta": {
</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">+ "test_single": "",
+ "test_multi": [],
+ "meta_key": "meta_value",
+ "test_tag_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></pre>
</div>
</div>
</body>
</html>