<!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>[49514] branches/5.2: Build Tools: Fix running installing Composer dependencies using Composer 2.0.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/49514">49514</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/49514","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-11-06 16:28:46 +0000 (Fri, 06 Nov 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Build Tools: Fix running installing Composer dependencies using Composer 2.0.
This updates the `dealerdirect/phpcodesniffer-composer-installer` package to allow installing version `0.7.0` which supports Composer 2.0.
It also includes several minor spacing/alignment coding standards fixes that are made as a result of the package update.
Props itowhid06, jrf.
Merges <a href="https://core.trac.wordpress.org/changeset/49306">[49306]</a> to the 5.2 branch.
See <a href="https://core.trac.wordpress.org/ticket/51624">#51624</a>, <a href="https://core.trac.wordpress.org/ticket/48301">#48301</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches52composerjson">branches/5.2/composer.json</a></li>
<li><a href="#branches52composerlock">branches/5.2/composer.lock</a></li>
<li><a href="#branches52srcwpadminincludesclasswplinkslisttablephp">branches/5.2/src/wp-admin/includes/class-wp-links-list-table.php</a></li>
<li><a href="#branches52srcwpadminincludesmediaphp">branches/5.2/src/wp-admin/includes/media.php</a></li>
<li><a href="#branches52srcwpadminpluginsphp">branches/5.2/src/wp-admin/plugins.php</a></li>
<li><a href="#branches52srcwpadminthemeinstallphp">branches/5.2/src/wp-admin/theme-install.php</a></li>
<li><a href="#branches52srcwpincludesscriptloaderphp">branches/5.2/src/wp-includes/script-loader.php</a></li>
<li><a href="#branches52testsphpunittestsmultisitenetworkphp">branches/5.2/tests/phpunit/tests/multisite/network.php</a></li>
<li><a href="#branches52testsphpunittestspostgetPagesphp">branches/5.2/tests/phpunit/tests/post/getPages.php</a></li>
<li><a href="#branches52testsphpunitteststermgetTermsphp">branches/5.2/tests/phpunit/tests/term/getTerms.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches52">branches/5.2/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/5.2
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/5.2 2020-11-06 14:14:50 UTC (rev 49513)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/5.2 2020-11-06 16:28:46 UTC (rev 49514)
</ins><a id="branches52"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/5.2</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:43557,43622
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:45284-45285,45287,45289,45292,45296,45298,45300-45301,45308-45311,45316,45319,45322,45324,45326,45328,45331,45334,45336,45338,45340,45342,45344-45346,45348,45350,45352,45357,45365,45367,45376,45403,45411,45416,45425,45463,45481,45488,45495,45501-45503,45506-45507,45515,45520,45522,45526-45527,45529,45551,45563-45564,45569,45572,45576,45618-45619,45626,45655-45656,45673,45684,45701,45722,45725,45727,45750,45761,45764,45861,45863,45867,45869,45935-45936,45971,45979,45990,45997,46019,46073,46472,46474-46476,46478,46483,46485,46893-46896,47313,47318,47341,47633-47638,47790,47887,47889,47948-47951,47984,48241,48338,48341,49380,49382-49388,49452
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:45284-45285,45287,45289,45292,45296,45298,45300-45301,45308-45311,45316,45319,45322,45324,45326,45328,45331,45334,45336,45338,45340,45342,45344-45346,45348,45350,45352,45357,45365,45367,45376,45403,45411,45416,45425,45463,45481,45488,45495,45501-45503,45506-45507,45515,45520,45522,45526-45527,45529,45551,45563-45564,45569,45572,45576,45618-45619,45626,45655-45656,45673,45684,45701,45722,45725,45727,45750,45761,45764,45861,45863,45867,45869,45935-45936,45971,45979,45990,45997,46019,46073,46472,46474-46476,46478,46483,46485,46893-46896,47313,47318,47341,47633-47638,47790,47887,47889,47948-47951,47984,48241,48338,48341,49306,49380,49382-49388,49452
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches52composerjson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/composer.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/composer.json 2020-11-06 14:14:50 UTC (rev 49513)
+++ branches/5.2/composer.json 2020-11-06 16:28:46 UTC (rev 49514)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "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.5.0",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7.0",
</ins><span class="cx" style="display: block; padding: 0 10px"> "wp-coding-standards/wpcs": "~2.0.0"
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "scripts": {
</span></span></pre></div>
<a id="branches52composerlock"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/composer.lock</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/composer.lock 2020-11-06 14:14:50 UTC (rev 49513)
+++ branches/5.2/composer.lock 2020-11-06 16:28:46 UTC (rev 49514)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,27 +4,27 @@
</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": "c7426ffeca8db395605e43bccf174b02",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "content-hash": "0d68b3d8b17e827e096ecb10a063f34c",
</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.5.0",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "version": "v0.7.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": "e749410375ff6fb7a040a68878c656c2e610b132"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "reference": "e8d808670b8f882188368faaf1144448c169c0b7"
</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/e749410375ff6fb7a040a68878c656c2e610b132",
- "reference": "e749410375ff6fb7a040a68878c656c2e610b132",
</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/e8d808670b8f882188368faaf1144448c169c0b7",
+ "reference": "e8d808670b8f882188368faaf1144448c169c0b7",
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "composer-plugin-api": "^1.0",
- "php": "^5.3|^7",
- "squizlabs/php_codesniffer": "^2|^3"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "composer-plugin-api": "^1.0 || ^2.0",
+ "php": ">=5.3",
+ "squizlabs/php_codesniffer": "^2 || ^3 || 4.0.x-dev"
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,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": "2018-10-26T13:21:45+00:00"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "time": "2020-06-25T14:57:39+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.4.0",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "version": "3.5.8",
</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": "379deb987e26c7cd103a7b387aea178baec96e48"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "reference": "9d583721a7157ee997f235f327de038e7ea6dac4"
</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/379deb987e26c7cd103a7b387aea178baec96e48",
- "reference": "379deb987e26c7cd103a7b387aea178baec96e48",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9d583721a7157ee997f235f327de038e7ea6dac4",
+ "reference": "9d583721a7157ee997f235f327de038e7ea6dac4",
</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">@@ -117,12 +117,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><span class="cx" style="display: block; padding: 0 10px"> "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "homepage": "http://www.squizlabs.com/php-codesniffer",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
</ins><span class="cx" style="display: block; padding: 0 10px"> "keywords": [
</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-12-19T23:57:18+00:00"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "time": "2020-10-23T02:01:07+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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,12 +129,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "version": "2.0.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "source": {
</span><span class="cx" style="display: block; padding: 0 10px"> "type": "git",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "url": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "url": "https://github.com/WordPress/WordPress-Coding-Standards.git",
</ins><span class="cx" style="display: block; padding: 0 10px"> "reference": "c9eaadaafefce36b3cb7e06eb15305b8c4cae9ce"
</span><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/c9eaadaafefce36b3cb7e06eb15305b8c4cae9ce",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/c9eaadaafefce36b3cb7e06eb15305b8c4cae9ce",
</ins><span class="cx" style="display: block; padding: 0 10px"> "reference": "c9eaadaafefce36b3cb7e06eb15305b8c4cae9ce",
</span><span class="cx" style="display: block; padding: 0 10px"> "shasum": ""
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,5 +176,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "prefer-stable": false,
</span><span class="cx" style="display: block; padding: 0 10px"> "prefer-lowest": false,
</span><span class="cx" style="display: block; padding: 0 10px"> "platform": [],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "platform-dev": []
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "platform-dev": [],
+ "plugin-api-version": "1.1.0"
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches52srcwpadminincludesclasswplinkslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/src/wp-admin/includes/class-wp-links-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/src/wp-admin/includes/class-wp-links-list-table.php 2020-11-06 14:14:50 UTC (rev 49513)
+++ branches/5.2/src/wp-admin/includes/class-wp-links-list-table.php 2020-11-06 16:28:46 UTC (rev 49514)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +117,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<label class="screen-reader-text" for="cat_id">' . __( 'Filter by category' ) . '</label>';
</span><span class="cx" style="display: block; padding: 0 10px"> wp_dropdown_categories( $dropdown_options );
</span><span class="cx" style="display: block; padding: 0 10px"> submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><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="branches52srcwpadminincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/src/wp-admin/includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/src/wp-admin/includes/media.php 2020-11-06 14:14:50 UTC (rev 49513)
+++ branches/5.2/src/wp-admin/includes/media.php 2020-11-06 16:28:46 UTC (rev 49514)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3048,7 +3048,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'tinymce' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'quicktags' => $quicktags_settings,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="attachment_content"><strong><?php _e( 'Description' ); ?></strong>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="branches52srcwpadminpluginsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/src/wp-admin/plugins.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/src/wp-admin/plugins.php 2020-11-06 14:14:50 UTC (rev 49513)
+++ branches/5.2/src/wp-admin/plugins.php 2020-11-06 16:28:46 UTC (rev 49514)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -440,7 +440,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'The search for installed plugins will search for terms in their name, description, or author.' ) . ' <span id="live-search-desc" class="hide-if-no-js">' . __( 'The search results will be updated as you type.' ) . '</span></p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: WordPress Plugin Directory URL */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'If you would like to see more plugins to choose from, click on the “Add New” button and you will be able to browse or search for additional plugins from the <a href="%s">WordPress Plugin Directory</a>. Plugins in the WordPress Plugin Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'If you would like to see more plugins to choose from, click on the “Add New” button and you will be able to browse or search for additional plugins from the <a href="%s">WordPress Plugin Directory</a>. Plugins in the WordPress Plugin Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'https://wordpress.org/plugins/' )
</span><span class="cx" style="display: block; padding: 0 10px"> ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -453,7 +453,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Most of the time, plugins play nicely with the core of WordPress and with other plugins. Sometimes, though, a plugin’s code will get in the way of another plugin, causing compatibility issues. If your site starts doing strange things, this may be the problem. Try deactivating all your plugins and re-activating them in various combinations until you isolate which one(s) caused the issue.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: WP_PLUGIN_DIR constant value */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'If something goes wrong with a plugin and you can’t use WordPress, delete or rename that file in the %s directory and it will be automatically deactivated.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'If something goes wrong with a plugin and you can’t use WordPress, delete or rename that file in the %s directory and it will be automatically deactivated.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<code>' . WP_PLUGIN_DIR . '</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="branches52srcwpadminthemeinstallphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/src/wp-admin/theme-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/src/wp-admin/theme-install.php 2020-11-06 14:14:50 UTC (rev 49513)
+++ branches/5.2/src/wp-admin/theme-install.php 2020-11-06 16:28:46 UTC (rev 49514)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +93,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $help_overview =
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Theme Directory URL */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the <a href="%s">WordPress Theme Directory</a>. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the <a href="%s">WordPress Theme Directory</a>. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'https://wordpress.org/themes/' )
</span><span class="cx" style="display: block; padding: 0 10px"> ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter.' ) . ' <span id="live-search-desc">' . __( 'The search results will be updated as you type.' ) . '</span></p>' .
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Alternately, you can browse the themes that are Featured, Popular, or Latest. When you find a theme you like, you can preview it or install it.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: /wp-content/themes */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme’s folder via FTP into your %s directory.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme’s folder via FTP into your %s directory.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<code>/wp-content/themes</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches52srcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/src/wp-includes/script-loader.php 2020-11-06 14:14:50 UTC (rev 49513)
+++ branches/5.2/src/wp-includes/script-loader.php 2020-11-06 16:28:46 UTC (rev 49514)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1469,7 +1469,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'themePreviewUnavailable' => __( 'Sorry, you can’t preview new themes when you have changes scheduled or saved as a draft. Please publish your changes, or wait until they publish to preview new themes.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'themeInstallUnavailable' => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: URL to Add Themes admin screen */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'You won’t be able to install new themes from here yet since your install requires SFTP credentials. For now, please <a href="%s">add themes in the admin</a>.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'You won’t be able to install new themes from here yet since your install requires SFTP credentials. For now, please <a href="%s">add themes in the admin</a>.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url( admin_url( 'theme-install.php' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'publishSettings' => __( 'Publish Settings' ),
</span></span></pre></div>
<a id="branches52testsphpunittestsmultisitenetworkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/tests/phpunit/tests/multisite/network.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/tests/phpunit/tests/multisite/network.php 2020-11-06 14:14:50 UTC (rev 49513)
+++ branches/5.2/tests/phpunit/tests/multisite/network.php 2020-11-06 16:28:46 UTC (rev 49514)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,7 +274,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // activate the plugin sitewide
</span><span class="cx" style="display: block; padding: 0 10px"> activate_plugin( $path, '', $network_wide = true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $active_plugins = wp_get_active_network_plugins();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $active_plugins = wp_get_active_network_plugins();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( WP_PLUGIN_DIR . '/hello.php' ), $active_plugins );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //deactivate the plugin
</span></span></pre></div>
<a id="branches52testsphpunittestspostgetPagesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/tests/phpunit/tests/post/getPages.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/tests/phpunit/tests/post/getPages.php 2020-11-06 14:14:50 UTC (rev 49513)
+++ branches/5.2/tests/phpunit/tests/post/getPages.php 2020-11-06 16:28:46 UTC (rev 49514)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $pages = get_pages();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 3, count( $pages ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $time1 = wp_cache_get( 'last_changed', 'posts' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $num_queries = $wpdb->num_queries;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $num_queries = $wpdb->num_queries;
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $pages as $page ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Post', $page );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches52testsphpunitteststermgetTermsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/tests/phpunit/tests/term/getTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/tests/phpunit/tests/term/getTerms.php 2020-11-06 14:14:50 UTC (rev 49513)
+++ branches/5.2/tests/phpunit/tests/term/getTerms.php 2020-11-06 16:28:46 UTC (rev 49514)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,7 +173,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Force last_changed to bump.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_term( $terms[0]->term_id, 'post_tag' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $num_queries = $wpdb->num_queries;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $num_queries = $wpdb->num_queries;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEquals( $time1, $time2 = wp_cache_get( 'last_changed', 'terms' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // last_changed and num_queries should bump after a term is deleted.
</span></span></pre>
</div>
</div>
</body>
</html>