<!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>[44574] trunk: Coding Standards: Upgrade WPCS to 1.2.1.</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/44574">44574</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/44574","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>2019-01-12 06:40:16 +0000 (Sat, 12 Jan 2019)</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.2.1.
This upgrade fixes quite a few false positives, as well as auto-fixing some indenting issues.
Fixes <a href="https://core.trac.wordpress.org/ticket/45956">#45956</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkcomposerjson">trunk/composer.json</a></li>
<li><a href="#trunkcomposerlock">trunk/composer.lock</a></li>
<li><a href="#trunkphpcsxmldist">trunk/phpcs.xml.dist</a></li>
<li><a href="#trunksrcwpactivatephp">trunk/src/wp-activate.php</a></li>
<li><a href="#trunksrcwpadmincustomheaderphp">trunk/src/wp-admin/custom-header.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswplisttablephp">trunk/src/wp-admin/includes/class-wp-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="#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="#trunksrcwpadminincludesclasswpuserslisttablephp">trunk/src/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesmetaboxesphp">trunk/src/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunksrcwpadminincludesmsphp">trunk/src/wp-admin/includes/ms.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="#trunksrcwpadminnavmenusphp">trunk/src/wp-admin/nav-menus.php</a></li>
<li><a href="#trunksrcwpadminnetworksitenewphp">trunk/src/wp-admin/network/site-new.php</a></li>
<li><a href="#trunksrcwpadminoptionspermalinkphp">trunk/src/wp-admin/options-permalink.php</a></li>
<li><a href="#trunksrcwpadminusereditphp">trunk/src/wp-admin/user-edit.php</a></li>
<li><a href="#trunksrcwpadminusersphp">trunk/src/wp-admin/users.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevencommentsphp">trunk/src/wp-content/themes/twentyeleven/comments.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevencontentgalleryphp">trunk/src/wp-content/themes/twentyeleven/content-gallery.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfifteenheaderphp">trunk/src/wp-content/themes/twentyfifteen/header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfifteeninctemplatetagsphp">trunk/src/wp-content/themes/twentyfifteen/inc/template-tags.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentasidephp">trunk/src/wp-content/themes/twentyfourteen/content-aside.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentaudiophp">trunk/src/wp-content/themes/twentyfourteen/content-audio.php</a></li>
<li><a href="#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="#trunksrcwpcontentthemestwentyfourteencontentnonephp">trunk/src/wp-content/themes/twentyfourteen/content-none.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="#trunksrcwpcontentthemestwentyfourteeninctemplatetagsphp">trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeentemplatepartspostcontentnonephp">trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-none.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentysixteenheaderphp">trunk/src/wp-content/themes/twentysixteen/header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentysixteeninctemplatetagsphp">trunk/src/wp-content/themes/twentysixteen/inc/template-tags.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytenloopphp">trunk/src/wp-content/themes/twentyten/loop.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteencontentnonephp">trunk/src/wp-content/themes/twentythirteen/content-none.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="#trunksrcwpincludesfeedrss2commentsphp">trunk/src/wp-includes/feed-rss2-comments.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetarchivesphp">trunk/src/wp-includes/widgets/class-wp-widget-archives.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgettextphp">trunk/src/wp-includes/widgets/class-wp-widget-text.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/composer.json 2019-01-12 06:40:16 UTC (rev 44574)
</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": "~1.0.0"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "dealerdirect/phpcodesniffer-composer-installer": "~0.5.0",
+ "wp-coding-standards/wpcs": "~1.2.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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/composer.lock 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,35 +4,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
</span><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": "525cadb533bc92cc922d79144b33b14a",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "content-hash": "c3625c9fc2ce3a44cad41a64f258bafd",
</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="cx" style="display: block; padding: 0 10px"> "name": "dealerdirect/phpcodesniffer-composer-installer",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "version": "v0.4.4",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "version": "v0.5.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/Dealerdirect/phpcodesniffer-composer-installer.git",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "reference": "2e41850d5f7797cbb1af7b030d245b3b24e63a08"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "reference": "e749410375ff6fb7a040a68878c656c2e610b132"
</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/Dealerdirect/phpcodesniffer-composer-installer/zipball/2e41850d5f7797cbb1af7b030d245b3b24e63a08",
- "reference": "2e41850d5f7797cbb1af7b030d245b3b24e63a08",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/e749410375ff6fb7a040a68878c656c2e610b132",
+ "reference": "e749410375ff6fb7a040a68878c656c2e610b132",
</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="cx" style="display: block; padding: 0 10px"> "composer-plugin-api": "^1.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "php": "^5.3|^7",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "squizlabs/php_codesniffer": "*"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "squizlabs/php_codesniffer": "^2|^3"
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "require-dev": {
</span><span class="cx" style="display: block; padding: 0 10px"> "composer/composer": "*",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "wimg/php-compatibility": "^8.0"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "phpcompatibility/php-compatibility": "^9.0",
+ "sensiolabs/security-checker": "^4.1.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">- "suggest": {
- "dealerdirect/qa-tools": "All the PHP QA tools you'll need"
- },
</del><span class="cx" style="display: block; padding: 0 10px"> "type": "composer-plugin",
</span><span class="cx" style="display: block; padding: 0 10px"> "extra": {
</span><span class="cx" style="display: block; padding: 0 10px"> "class": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin"
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,13 +47,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "authors": [
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> "name": "Franck Nijhof",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "email": "f.nijhof@dealerdirect.nl",
- "homepage": "http://workingatdealerdirect.eu",
- "role": "Developer"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "email": "franck.nijhof@dealerdirect.com",
+ "homepage": "http://www.frenck.nl",
+ "role": "Developer / IT Manager"
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><span class="cx" style="display: block; padding: 0 10px"> "description": "PHP_CodeSniffer Standards Composer Installer Plugin",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "homepage": "http://workingatdealerdirect.eu",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "homepage": "http://www.dealerdirect.com",
</ins><span class="cx" style="display: block; padding: 0 10px"> "keywords": [
</span><span class="cx" style="display: block; padding: 0 10px"> "PHPCodeSniffer",
</span><span class="cx" style="display: block; padding: 0 10px"> "PHP_CodeSniffer",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,20 +71,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "stylecheck",
</span><span class="cx" style="display: block; padding: 0 10px"> "tests"
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "time": "2017-12-06T16:27:17+00:00"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "time": "2018-10-26T13:21:45+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": "squizlabs/php_codesniffer",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "version": "3.3.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "version": "3.4.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/squizlabs/PHP_CodeSniffer.git",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "reference": "628a481780561150481a9ec74709092b9759b3ec"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "reference": "379deb987e26c7cd103a7b387aea178baec96e48"
</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/628a481780561150481a9ec74709092b9759b3ec",
- "reference": "628a481780561150481a9ec74709092b9759b3ec",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/379deb987e26c7cd103a7b387aea178baec96e48",
+ "reference": "379deb987e26c7cd103a7b387aea178baec96e48",
</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 +122,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-07-26T23:47:18+00:00"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "time": "2018-12-19T23:57: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": "1.0.0",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "version": "1.2.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/WordPress-Coding-Standards/WordPress-Coding-Standards.git",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "reference": "539c6d74e6207daa22b7ea754d6f103e9abb2755"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "reference": "f328bcafd97377e8e5e5d7b244d5ddbf301a3a5c"
</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/539c6d74e6207daa22b7ea754d6f103e9abb2755",
- "reference": "539c6d74e6207daa22b7ea754d6f103e9abb2755",
</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/f328bcafd97377e8e5e5d7b244d5ddbf301a3a5c",
+ "reference": "f328bcafd97377e8e5e5d7b244d5ddbf301a3a5c",
</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">@@ -145,7 +143,7 @@
</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><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">- "phpcompatibility/php-compatibility": "*"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "phpcompatibility/php-compatibility": "^9.0"
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "suggest": {
</span><span class="cx" style="display: block; padding: 0 10px"> "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically."
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,7 +165,7 @@
</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-07-25T18:10:35+00:00"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "time": "2018-12-18T09:43:51+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></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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/phpcs.xml.dist 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,12 +5,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <rule ref="PEAR.Functions.FunctionCallSignature">
- <properties>
- <property name="allowMultipleArguments" value="false"/>
- </properties>
- </rule>
-
</del><span class="cx" style="display: block; padding: 0 10px"> <rule ref="WordPress.NamingConventions.ValidVariableName">
</span><span class="cx" style="display: block; padding: 0 10px"> <properties>
</span><span class="cx" style="display: block; padding: 0 10px"> <property name="customPropertiesWhitelist" type="array">
</span></span></pre></div>
<a id="trunksrcwpactivatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-activate.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-activate.php 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-activate.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,10 +135,10 @@
</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"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} else {
- if ( is_wp_error( $result ) && in_array( $result->get_error_code(), $valid_error_codes ) ) {
- $signup = $result->get_error_data();
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ if ( is_wp_error( $result ) && in_array( $result->get_error_code(), $valid_error_codes ) ) {
+ $signup = $result->get_error_data();
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e( 'Your account is now active!' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p class="lead-in">';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,17 +162,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"> echo '</p>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $result === null || is_wp_error( $result ) ) {
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $result === null || is_wp_error( $result ) ) {
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e( 'An error occurred during the activation' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_wp_error( $result ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php echo $result->get_error_message(); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</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">- } else {
- $url = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
- $user = get_userdata( (int) $result['user_id'] );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ $url = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
+ $user = get_userdata( (int) $result['user_id'] );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e( 'Your account is now active!' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="signup-welcome">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,11 +199,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url( 'wp-login.php', 'login' ), network_home_url() );
</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
- 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">-}
-?>
</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>
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-admin/custom-header.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -642,43 +642,43 @@
</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"> endif;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! empty( $this->default_headers ) ) :
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $this->default_headers ) ) :
+ ?>
</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( '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><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><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><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
- $this->show_header_selector( 'default' );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $this->show_header_selector( 'default' );
+ ?>
</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">-if ( get_header_image() ) :
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_header_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"> <p><?php _e( 'This will remove the header image. You will not be able to restore any customizations.' ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php submit_button( __( 'Remove Header Image' ), '', 'removeheader', false ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( __( 'Remove Header Image' ), '', 'removeheader', false ); ?>
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $default_image = sprintf( get_theme_support( 'custom-header', 'default-image' ), get_template_directory_uri(), get_stylesheet_directory_uri() );
-if ( $default_image && get_header_image() != $default_image ) :
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $default_image = sprintf( get_theme_support( 'custom-header', 'default-image' ), get_template_directory_uri(), get_stylesheet_directory_uri() );
+ if ( $default_image && get_header_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( 'Reset 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( 'This will restore the original header image. You will not be able to restore any customizations.' ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php submit_button( __( 'Restore Original Header Image' ), '', 'resetheader', false ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( __( 'Restore Original Header Image' ), '', 'resetheader', false ); ?>
</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">@@ -741,7 +741,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'custom_header_options' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-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">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button( null, 'primary', 'save-header-options' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-admin/includes/class-wp-list-table.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1218,7 +1218,7 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-?>
</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"> <br class="clear" />
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,7 +280,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?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><span class="cx" style="display: block; padding: 0 10px"> <?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><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -392,7 +392,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <br class="clear" />
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</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="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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1471,7 +1471,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></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 if ( is_post_type_viewable( $screen->post_type ) ) : // is_post_type_viewable check ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( is_post_type_viewable( $screen->post_type ) ) : // is_post_type_viewable check ?>
</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( 'Slug' ); ?></span>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1478,7 +1478,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="input-text-wrap"><input type="text" name="post_name" value="" /></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
</del><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_post_type_viewable check
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1493,39 +1493,39 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( post_type_supports( $screen->post_type, 'author' ) ) :
- $authors_dropdown = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( post_type_supports( $screen->post_type, 'author' ) ) :
+ $authors_dropdown = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( current_user_can( $post_type_object->cap->edit_others_posts ) ) :
- $users_opt = array(
- 'hide_if_only_one_author' => false,
- 'who' => 'authors',
- 'name' => 'post_author',
- 'class' => 'authors',
- 'multi' => 1,
- 'echo' => 0,
- 'show' => 'display_name_with_login',
- );
- if ( $bulk ) {
- $users_opt['show_option_none'] = __( '— No Change —' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( current_user_can( $post_type_object->cap->edit_others_posts ) ) :
+ $users_opt = array(
+ 'hide_if_only_one_author' => false,
+ 'who' => 'authors',
+ 'name' => 'post_author',
+ 'class' => 'authors',
+ 'multi' => 1,
+ 'echo' => 0,
+ 'show' => 'display_name_with_login',
+ );
+ if ( $bulk ) {
+ $users_opt['show_option_none'] = __( '— 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">- if ( $authors = wp_dropdown_users( $users_opt ) ) :
- $authors_dropdown = '<label class="inline-edit-author">';
- $authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';
- $authors_dropdown .= $authors;
- $authors_dropdown .= '</label>';
- endif;
- endif; // authors
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $authors = wp_dropdown_users( $users_opt ) ) :
+ $authors_dropdown = '<label class="inline-edit-author">';
+ $authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';
+ $authors_dropdown .= $authors;
+ $authors_dropdown .= '</label>';
+ endif;
+ endif; // authors
+ ?>
</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 ) {
- echo $authors_dropdown;}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( ! $bulk ) {
+ echo $authors_dropdown;}
</ins><span class="cx" style="display: block; padding: 0 10px"> endif; // post_type_supports author
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! $bulk && $can_publish ) :
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $bulk && $can_publish ) :
+ ?>
</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="alignleft">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1545,7 +1545,7 @@
</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">
</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></fieldset>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1690,7 +1690,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : // $bulk ?>
</span><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"> <input type="checkbox" name="comment_status" value="open" />
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="checkbox-title"><?php _e( 'Allow Comments' ); ?></span>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1703,7 +1703,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
</del><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"> endif; // post_type_supports comments or pings
</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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-admin/includes/class-wp-screen.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -918,8 +918,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( $this->show_screen_options() ) :
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $this->show_screen_options() ) :
+ ?>
</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></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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-admin/includes/class-wp-users-list-table.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,7 +286,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @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><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="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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-admin/includes/meta-boxes.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -318,7 +318,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><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
</del><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"> else :
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-admin/includes/ms.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -998,11 +998,11 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
</del><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"> 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></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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-admin/includes/plugin-install.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -696,10 +696,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><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><span class="cx" style="display: block; padding: 0 10px"> <?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">-if ( ! empty( $api->ratings ) && array_sum( (array) $api->ratings ) > 0 ) {
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $api->ratings ) && array_sum( (array) $api->ratings ) > 0 ) {
+ ?>
</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">@@ -727,9 +727,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
-if ( ! empty( $api->contributors ) ) {
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ if ( ! empty( $api->contributors ) ) {
+ ?>
</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">@@ -747,10 +747,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"> </ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( ! empty( $api->donate_link ) ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! empty( $api->donate_link ) ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a target="_blank" href="<?php echo esc_url( $api->donate_link ); ?>"><?php _e( 'Donate to this plugin »' ); ?></a>
</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 } ?>
</del><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 id="section-holder" class="wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-admin/includes/post.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1732,16 +1732,16 @@
</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><span class="cx" style="display: block; padding: 0 10px"> <?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><span class="cx" style="display: block; padding: 0 10px"> // Allow plugins to prevent some users overriding the post lock
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( $override ) {
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $override ) {
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a class="button button-primary wp-tab-last" href="<?php echo esc_url( add_query_arg( 'get-post-lock', '1', wp_nonce_url( get_edit_post_link( $post->ID, 'url' ), 'lock-post_' . $post->ID ) ) ); ?>"><?php _e( 'Take over' ); ?></a>
</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">-}
</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"> </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></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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-admin/nav-menus.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -822,14 +822,14 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
</del><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"> $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">@@ -914,10 +914,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"> $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></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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-admin/network/site-new.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,14 +231,14 @@
</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><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} else {
- echo get_network()->domain . get_network()->path
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ echo get_network()->domain . get_network()->path
+ ?>
</ins><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"> 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="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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-admin/options-permalink.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -349,28 +349,28 @@
</span><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
- printf(
- /* translators: 1: Codex URL, 2: web.config, 3: CTRL + a */
- __( '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.' ),
- __( 'https://codex.wordpress.org/Changing_File_Permissions' ),
- '<code>web.config</code>',
- '<kbd>CTRL + a</kbd>'
- );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ printf(
+ /* translators: 1: Codex URL, 2: web.config, 3: CTRL + a */
+ __( '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.' ),
+ __( 'https://codex.wordpress.org/Changing_File_Permissions' ),
+ '<code>web.config</code>',
+ '<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="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
- printf(
- /* translators: %s: web.config */
- __( '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.' ),
- '<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 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.' ),
+ '<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 endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-admin/user-edit.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,7 +228,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?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><span class="cx" style="display: block; padding: 0 10px"> <?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><span class="cx" style="display: block; padding: 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,13 +304,13 @@
</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"> endif; // $_wp_admin_css_colors
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) :
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr class="user-comment-shortcuts-wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><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="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"> <tr class="show-admin-bar user-admin-bar-front-wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Toolbar' ); ?></th>
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -414,17 +414,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endif; //!IS_PROFILE_PAGE
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && ! isset( $super_admins ) ) {
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && ! isset( $super_admins ) ) {
+ ?>
</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="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</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 } ?>
</del><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"> <tr class="user-first-name-wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <th><label for="first_name"><?php _e( 'First Name' ); ?></label></th>
</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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-admin/users.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,7 +288,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="delete_option" value="delete" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( 1 == $go_delete ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 1 == $go_delete ) : ?>
</ins><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="cx" style="display: block; padding: 0 10px"> <fieldset><p><legend><?php _e( 'What should be done with content owned by these users?' ); ?></legend></p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -295,33 +295,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul style="list-style:none;">
</span><span class="cx" style="display: block; padding: 0 10px"> <li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( 'Delete all content.' ); ?></label></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e( 'Delete all content.' ); ?></label></li>
</ins><span class="cx" style="display: block; padding: 0 10px"> <li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- echo '<label for="delete_option1">' . __( 'Attribute all content to:' ) . '</label> ';
- wp_dropdown_users(
- array(
- 'name' => 'reassign_user',
- 'exclude' => array_diff( $userids, array( $current_user->ID ) ),
- 'show' => 'display_name_with_login',
- )
- );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ echo '<label for="delete_option1">' . __( 'Attribute all content to:' ) . '</label> ';
+ wp_dropdown_users(
+ array(
+ 'name' => 'reassign_user',
+ 'exclude' => array_diff( $userids, array( $current_user->ID ) ),
+ 'show' => 'display_name_with_login',
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul></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"> endif;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Fires at the end of the delete users form prior to the confirm button.
- *
- * @since 4.0.0
- * @since 4.5.0 The `$userids` parameter was added.
- *
- * @param WP_User $current_user WP_User object for the current user.
- * @param int[] $userids Array of IDs for users being deleted.
- */
- do_action( 'delete_user_form', $current_user, $userids );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Fires at the end of the delete users form prior to the confirm button.
+ *
+ * @since 4.0.0
+ * @since 4.5.0 The `$userids` parameter was added.
+ *
+ * @param WP_User $current_user WP_User object for the current user.
+ * @param int[] $userids Array of IDs for users being deleted.
+ */
+ do_action( 'delete_user_form', $current_user, $userids );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="action" value="dodelete" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button( __( 'Confirm Deletion' ), 'primary' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -522,12 +522,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! empty( $messages ) ) {
- foreach ( $messages as $msg ) {
- echo $msg;
- }
-}
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $messages ) ) {
+ foreach ( $messages as $msg ) {
+ echo $msg;
+ }
+ }
+ ?>
</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></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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-content/themes/twentyeleven/comments.php 2019-01-12 06:40:16 UTC (rev 44574)
</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></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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-content/themes/twentyeleven/content-gallery.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,14 +55,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // end twentyeleven_get_gallery_images() check ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_excerpt(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- wp_link_pages(
- array(
- 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>',
- 'after' => '</div>',
- )
- );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ wp_link_pages(
+ array(
+ 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>',
+ 'after' => '</div>',
+ )
+ );
+ ?>
</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="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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-content/themes/twentyfifteen/header.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,16 +36,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></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">
</span><span class="cx" style="display: block; padding: 0 10px"> $description = get_bloginfo( 'description', 'display' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( $description || is_customize_preview() ) :
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $description || is_customize_preview() ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="site-description"><?php echo $description; ?></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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-?>
</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="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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-content/themes/twentyfifteen/inc/template-tags.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +209,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </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">- <?php
</del><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 is_singular()
</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="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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-content/themes/twentyfourteen/content-aside.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,8 +19,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( is_single() ) :
- the_title( '<h1 class="entry-title">', '</h1>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_single() ) :
+ the_title( '<h1 class="entry-title">', '</h1>' );
</ins><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></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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-content/themes/twentyfourteen/content-audio.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,8 +19,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( is_single() ) :
- the_title( '<h1 class="entry-title">', '</h1>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_single() ) :
+ the_title( '<h1 class="entry-title">', '</h1>' );
</ins><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></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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-content/themes/twentyfourteen/content-gallery.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,8 +19,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( is_single() ) :
- the_title( '<h1 class="entry-title">', '</h1>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_single() ) :
+ the_title( '<h1 class="entry-title">', '</h1>' );
</ins><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></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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-content/themes/twentyfourteen/content-image.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,8 +19,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( is_single() ) :
- the_title( '<h1 class="entry-title">', '</h1>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_single() ) :
+ the_title( '<h1 class="entry-title">', '</h1>' );
</ins><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></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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-content/themes/twentyfourteen/content-link.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,8 +19,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( is_single() ) :
- the_title( '<h1 class="entry-title">', '</h1>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_single() ) :
+ the_title( '<h1 class="entry-title">', '</h1>' );
</ins><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></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentnonephp"></a>
<div 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-none.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/content-none.php 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-content/themes/twentyfourteen/content-none.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,12 +20,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( is_search() ) : ?>
</span><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.', 'twentyfourteen' ); ?></p>
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'It seems we can’t find what you’re looking for. Perhaps searching can help.', 'twentyfourteen' ); ?></p>
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .page-content -->
</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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-content/themes/twentyfourteen/content-quote.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,8 +19,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( is_single() ) :
- the_title( '<h1 class="entry-title">', '</h1>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_single() ) :
+ the_title( '<h1 class="entry-title">', '</h1>' );
</ins><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></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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-content/themes/twentyfourteen/content-video.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,8 +19,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( is_single() ) :
- the_title( '<h1 class="entry-title">', '</h1>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_single() ) :
+ the_title( '<h1 class="entry-title">', '</h1>' );
</ins><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></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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-content/themes/twentyfourteen/content.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,8 +21,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( is_single() ) :
- the_title( '<h1 class="entry-title">', '</h1>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_single() ) :
+ the_title( '<h1 class="entry-title">', '</h1>' );
</ins><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></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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,16 +197,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <a class="post-thumbnail" href="<?php the_permalink(); ?>" aria-hidden="true">
</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( 'post-thumbnail', array( 'alt' => get_the_title() ) );
- }
- ?>
</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( 'post-thumbnail', array( 'alt' => get_the_title() ) );
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </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">- <?php
</del><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 is_singular()
</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="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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-none.php 2019-01-12 06:40:16 UTC (rev 44574)
</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="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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-content/themes/twentysixteen/header.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,12 +35,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></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">
</span><span class="cx" style="display: block; padding: 0 10px"> $description = get_bloginfo( 'description', 'display' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( $description || is_customize_preview() ) :
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $description || is_customize_preview() ) :
+ ?>
</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="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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-content/themes/twentysixteen/inc/template-tags.php 2019-01-12 06:40:16 UTC (rev 44574)
</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"> <?php the_post_thumbnail( 'post-thumbnail', array( 'alt' => the_title_attribute( 'echo=0' ) ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </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">- <?php
</del><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 is_singular()
</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="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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-content/themes/twentyten/loop.php 2019-01-12 06:40:16 UTC (rev 44574)
</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">@@ -143,7 +143,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php twentyten_posted_on(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-meta -->
</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_archive() || is_search() ) : // Only display excerpts for archives and search. ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( is_archive() || is_search() ) : // Only display excerpts for archives and search. ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-summary">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_excerpt(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-summary -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentythirteencontentnonephp"></a>
<div 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-none.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/content-none.php 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-content/themes/twentythirteen/content-none.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,12 +20,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( is_search() ) : ?>
</span><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 different keywords.', 'twentythirteen' ); ?></p>
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'It seems we can’t find what you’re looking for. Perhaps searching can help.', 'twentythirteen' ); ?></p>
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .page-content -->
</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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-includes/feed-atom-comments.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,13 +110,13 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
</del><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; // post pass
</span><span class="cx" style="display: block; padding: 0 10px"> // Return comment threading information (https://www.ietf.org/rfc/rfc4685.txt)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( $comment->comment_parent == 0 ) : // This comment is top level
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $comment->comment_parent == 0 ) : // This comment is top level
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <thr:in-reply-to ref="<?php the_guid(); ?>" href="<?php the_permalink_rss(); ?>" 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"> 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></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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-includes/feed-atom.php 2019-01-12 06:40:16 UTC (rev 44574)
</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></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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-includes/feed-rss2-comments.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,7 +105,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : // post pass ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <description><![CDATA[<?php comment_text_rss(); ?>]]></description>
</span><span class="cx" style="display: block; padding: 0 10px"> <content:encoded><![CDATA[<?php comment_text(); ?>]]></content:encoded>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
</del><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; // post pass
</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 RSS2 comment feed item.
</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"> * @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><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endwhile;
</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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-includes/widgets/class-wp-widget-archives.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,7 +131,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</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">-}
</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"> echo $args['after_widget'];
</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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-includes/widgets/class-wp-widget-text.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -493,7 +493,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <input id="<?php echo $this->get_field_id( 'filter' ); ?>" name="<?php echo $this->get_field_name( 'filter' ); ?>" type="checkbox"<?php checked( ! empty( $instance['filter'] ) ); ?> /> <label for="<?php echo $this->get_field_id( 'filter' ); ?>"><?php _e( 'Automatically add paragraphs' ); ?></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
</del><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="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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-login.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1114,13 +1114,13 @@
</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="cx" style="display: block; padding: 0 10px"> d = document.getElementById('user_login');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( 'invalid_username' == $errors->get_error_code() ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'invalid_username' == $errors->get_error_code() ) { ?>
</ins><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"> d.focus();
</span><span class="cx" style="display: block; padding: 0 10px"> d.select();
</span><span class="cx" style="display: block; padding: 0 10px"> } catch(e){}
</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 2019-01-12 06:05:55 UTC (rev 44573)
+++ trunk/src/wp-signup.php 2019-01-12 06:40:16 UTC (rev 44574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,9 +139,9 @@
</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><span class="cx" style="display: block; padding: 0 10px"> <?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"> 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></pre>
</div>
</div>
</body>
</html>