<!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>[44155] trunk: General: Fix some code formatting issues.</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/44155">44155</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/44155","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-12-14 03:24:35 +0000 (Fri, 14 Dec 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>General: Fix some code formatting issues.
A handful of code formatting issues were introduced in recent commits, runs the auto-fixer on them.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentynineteenclassesclasstwentynineteensvgiconsphp">trunk/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-svg-icons.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentynineteenclassesclasstwentynineteenwalkercommentphp">trunk/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-walker-comment.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentynineteencommentsphp">trunk/src/wp-content/themes/twentynineteen/comments.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentynineteenimagephp">trunk/src/wp-content/themes/twentynineteen/image.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentynineteeninccolorpatternsphp">trunk/src/wp-content/themes/twentynineteen/inc/color-patterns.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentynineteeninccustomizerphp">trunk/src/wp-content/themes/twentynineteen/inc/customizer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentynineteeninctemplatefunctionsphp">trunk/src/wp-content/themes/twentynineteen/inc/template-functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentynineteeninctemplatetagsphp">trunk/src/wp-content/themes/twentynineteen/inc/template-tags.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentynineteentemplatepartscontentcontentsinglephp">trunk/src/wp-content/themes/twentynineteen/template-parts/content/content-single.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentynineteentemplatepartsfooterfooterwidgetsphp">trunk/src/wp-content/themes/twentynineteen/template-parts/footer/footer-widgets.php</a></li>
<li><a href="#trunksrcwpincludesembedphp">trunk/src/wp-includes/embed.php</a></li>
<li><a href="#trunktestsphpunittestsoembedcontrollerphp">trunk/tests/phpunit/tests/oembed/controller.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentynineteenclassesclasstwentynineteensvgiconsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-svg-icons.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-svg-icons.php 2018-12-14 03:19:48 UTC (rev 44154)
+++ trunk/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-svg-icons.php 2018-12-14 03:24:35 UTC (rev 44155)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,13 +71,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @var array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> static $ui_icons = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'link' => /* material-design – link */ '
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'link' => /* material-design – link */ '
</ins><span class="cx" style="display: block; padding: 0 10px"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M0 0h24v24H0z" fill="none"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> </svg>',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'watch' => /* material-design – watch-later */ '
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'watch' => /* material-design – watch-later */ '
</ins><span class="cx" style="display: block; padding: 0 10px"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
</span><span class="cx" style="display: block; padding: 0 10px"> <defs>
</span><span class="cx" style="display: block; padding: 0 10px"> <path id="a" d="M0 0h24v24H0V0z"></path>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,73 +88,73 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <path clip-path="url(#b)" d="M12 2C6.5 2 2 6.5 2 12s4.5 10 10 10 10-4.5 10-10S17.5 2 12 2zm4.2 14.2L11 13V7h1.5v5.2l4.5 2.7-.8 1.3z"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> </svg>',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'archive' => /* material-design – folder */ '
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'archive' => /* material-design – folder */ '
</ins><span class="cx" style="display: block; padding: 0 10px"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M10 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2h-8l-2-2z"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M0 0h24v24H0z" fill="none"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> </svg>',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'tag' => /* material-design – local_offer */ '
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'tag' => /* material-design – local_offer */ '
</ins><span class="cx" style="display: block; padding: 0 10px"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M21.41 11.58l-9-9C12.05 2.22 11.55 2 11 2H4c-1.1 0-2 .9-2 2v7c0 .55.22 1.05.59 1.42l9 9c.36.36.86.58 1.41.58.55 0 1.05-.22 1.41-.59l7-7c.37-.36.59-.86.59-1.41 0-.55-.23-1.06-.59-1.42zM5.5 7C4.67 7 4 6.33 4 5.5S4.67 4 5.5 4 7 4.67 7 5.5 6.33 7 5.5 7z"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M0 0h24v24H0z" fill="none"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> </svg>',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'comment' => /* material-design – comment */ '
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'comment' => /* material-design – comment */ '
</ins><span class="cx" style="display: block; padding: 0 10px"> <svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M21.99 4c0-1.1-.89-2-1.99-2H4c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h14l4 4-.01-18z"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M0 0h24v24H0z" fill="none"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> </svg>',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'person' => /* material-design – person */ '
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'person' => /* material-design – person */ '
</ins><span class="cx" style="display: block; padding: 0 10px"> <svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M0 0h24v24H0z" fill="none"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> </svg>',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'edit' => /* material-design – edit */ '
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'edit' => /* material-design – edit */ '
</ins><span class="cx" style="display: block; padding: 0 10px"> <svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M0 0h24v24H0z" fill="none"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> </svg>',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'chevron_left' => /* material-design – chevron_left */ '
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'chevron_left' => /* material-design – chevron_left */ '
</ins><span class="cx" style="display: block; padding: 0 10px"> <svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M0 0h24v24H0z" fill="none"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> </svg>',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'chevron_right' => /* material-design – chevron_right */ '
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'chevron_right' => /* material-design – chevron_right */ '
</ins><span class="cx" style="display: block; padding: 0 10px"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M0 0h24v24H0z" fill="none"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> </svg>',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'check' => /* material-design – check */ '
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'check' => /* material-design – check */ '
</ins><span class="cx" style="display: block; padding: 0 10px"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M0 0h24v24H0z" fill="none"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> </svg>',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'arrow_drop_down_circle' => /* material-design – arrow_drop_down_circle */ '
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'arrow_drop_down_circle' => /* material-design – arrow_drop_down_circle */ '
</ins><span class="cx" style="display: block; padding: 0 10px"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M0 0h24v24H0z" fill="none"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 12l-4-4h8l-4 4z"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> </svg>',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'keyboard_arrow_down' => /* material-design – keyboard_arrow_down */ '
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'keyboard_arrow_down' => /* material-design – keyboard_arrow_down */ '
</ins><span class="cx" style="display: block; padding: 0 10px"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M7.41 8.59L12 13.17l4.59-4.58L18 10l-6 6-6-6 1.41-1.41z"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> <path fill="none" d="M0 0h24v24H0V0z"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> </svg>',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'keyboard_arrow_right' => /* material-design – keyboard_arrow_right */ '
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'keyboard_arrow_right' => /* material-design – keyboard_arrow_right */ '
</ins><span class="cx" style="display: block; padding: 0 10px"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M10 17l5-5-5-5v10z"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> <path fill="none" d="M0 24V0h24v24H0z"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> </svg>',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'keyboard_arrow_left' => /* material-design – keyboard_arrow_left */ '
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'keyboard_arrow_left' => /* material-design – keyboard_arrow_left */ '
</ins><span class="cx" style="display: block; padding: 0 10px"> <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M14 7l-5 5 5 5V7z"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> <path fill="none" d="M24 0v24H0V0h24z"></path>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,16 +205,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'facebook.com',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fb.me',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'feed' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'feed' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'feed',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'google-plus' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'plus.google.com',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'lastfm' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'lastfm' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'last.fm',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mail' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mail' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mailto:',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'slideshare' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,7 +343,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M12,4.622c2.403,0,2.688,0.009,3.637,0.052c0.877,0.04,1.354,0.187,1.671,0.31c0.42,0.163,0.72,0.358,1.035,0.673 c0.315,0.315,0.51,0.615,0.673,1.035c0.123,0.317,0.27,0.794,0.31,1.671c0.043,0.949,0.052,1.234,0.052,3.637 s-0.009,2.688-0.052,3.637c-0.04,0.877-0.187,1.354-0.31,1.671c-0.163,0.42-0.358,0.72-0.673,1.035 c-0.315,0.315-0.615,0.51-1.035,0.673c-0.317,0.123-0.794,0.27-1.671,0.31c-0.949,0.043-1.233,0.052-3.637,0.052 s-2.688-0.009-3.637-0.052c-0.877-0.04-1.354-0.187-1.671-0.31c-0.42-0.163-0.72-0.358-1.035-0.673 c-0.315-0.315-0.51-0.615-0.673-1.035c-0.123-0.317-0.27-0.794-0.31-1.671C4.631,14.688,4.622,14.403,4.622,12 s0.009-2.688,0.052-3.637c0.04-0.877,0.187-1.354,0.31-1.671c0.163-0.42,0.358-0.72,0.673-1.035 c0.315-0.315,0.615-0.51,1.035-0.673c0.317-0.123,0.794-0.27,1.671-0.31C9.312,4.631,9.597,4.622,12,4.622 M12,3 C9.556,3,9.249,3.01,8.289,3.054C7.331,3.098,6.677,3.25,6.105,3.472C5.513,3.702,5.011,4.01
,4.511,4.511 c-0.5,0.5-0.808,1.002-1.038,1.594C3.25,6.677,3.098,7.331,3.054,8.289C3.01,9.249,3,9.556,3,12c0,2.444,0.01,2.751,0.054,3.711 c0.044,0.958,0.196,1.612,0.418,2.185c0.23,0.592,0.538,1.094,1.038,1.594c0.5,0.5,1.002,0.808,1.594,1.038 c0.572,0.222,1.227,0.375,2.185,0.418C9.249,20.99,9.556,21,12,21s2.751-0.01,3.711-0.054c0.958-0.044,1.612-0.196,2.185-0.418 c0.592-0.23,1.094-0.538,1.594-1.038c0.5-0.5,0.808-1.002,1.038-1.594c0.222-0.572,0.375-1.227,0.418-2.185 C20.99,14.751,21,14.444,21,12s-0.01-2.751-0.054-3.711c-0.044-0.958-0.196-1.612-0.418-2.185c-0.23-0.592-0.538-1.094-1.038-1.594 c-0.5-0.5-1.002-0.808-1.594-1.038c-0.572-0.222-1.227-0.375-2.185-0.418C14.751,3.01,14.444,3,12,3L12,3z M12,7.378 c-2.552,0-4.622,2.069-4.622,4.622S9.448,16.622,12,16.622s4.622-2.069,4.622-4.622S14.552,7.378,12,7.378z M12,15 c-1.657,0-3-1.343-3-3s1.343-3,3-3s3,1.343,3,3S13.657,15,12,15z M16.804,6.116c-0.596,0-1.08,0.484-1.08,1.08 s0.484,1.08,1.08,1.08c0.596,0,1.08-0.484,1.08-1.08S17.401,6.116,16.804,
6.116z"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> </svg>',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'lastfm' => '
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'lastfm' => '
</ins><span class="cx" style="display: block; padding: 0 10px"> <svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
</span><span class="cx" style="display: block; padding: 0 10px"> <path d="M10.5002,0 C4.7006,0 0,4.70109753 0,10.4998496 C0,16.2989526 4.7006,21 10.5002,21 C16.299,21 21,16.2989526 21,10.4998496 C21,4.70109753 16.299,0 10.5002,0 Z M14.69735,14.7204413 C13.3164,14.7151781 12.4346,14.0870017 11.83445,12.6859357 L11.6816001,12.3451305 L10.35405,9.31011397 C9.92709997,8.26875064 8.85260001,7.57120012 7.68010001,7.57120012 C6.06945001,7.57120012 4.75925001,8.88509738 4.75925001,10.5009524 C4.75925001,12.1164565 6.06945001,13.4303036 7.68010001,13.4303036 C8.77200001,13.4303036 9.76514999,12.827541 10.2719501,11.8567047 C10.2893,11.8235214 10.3239,11.8019673 10.36305,11.8038219 C10.4007,11.8053759 10.43535,11.8287847 10.4504,11.8631709 L10.98655,13.1045863 C11.0016,13.1389726 10.9956,13.17782 10.97225,13.2068931 C10.1605001,14.1995341 8.96020001,14.7683115 7.68010001,14.7683115 C5.33305,14.7683115 3.42340001,12.8535563 3.42340001,10.5009524 C3.42340001,8.14679459 5.33300001,6.2320
3946 7.68010001,6.23203946 C9.45720002,6.23203946 10.8909,7.19074535 11.6138,8.86359341 C11.6205501,8.88018505 12.3412,10.5707777 12.97445,12.0190621 C13.34865,12.8739575 13.64615,13.3959676 14.6288,13.4291508 C15.5663001,13.4612814 16.25375,12.9121534 16.25375,12.1484869 C16.25375,11.4691321 15.8320501,11.3003585 14.8803,10.98216 C13.2365,10.4397989 12.34495,9.88605929 12.34495,8.51817658 C12.34495,7.1809207 13.26665,6.31615054 14.692,6.31615054 C15.62875,6.31615054 16.3155,6.7286858 16.79215,7.5768142 C16.80495,7.60062396 16.8079001,7.62814302 16.8004001,7.65420843 C16.7929,7.68027384 16.7748,7.70212868 16.7507001,7.713808 L15.86145,8.16900031 C15.8178001,8.19200805 15.7643,8.17807308 15.73565,8.13847371 C15.43295,7.71345711 15.0956,7.52513451 14.6423,7.52513451 C14.05125,7.52513451 13.6220001,7.92899802 13.6220001,8.48649708 C13.6220001,9.17382194 14.1529001,9.34144259 15.0339,9.61923972 C15.14915,9.65578139 15.26955,9.69397731 15.39385,9.73432853 C16.7763,10.1865133 17.57675,10.
7311301 17.57675,12.1836251 C17.57685,13.629654 16.3389,14.7204413 14.69735,14.7204413 Z"></path>
</span><span class="cx" style="display: block; padding: 0 10px"> </svg>',
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentynineteenclassesclasstwentynineteenwalkercommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-walker-comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-walker-comment.php 2018-12-14 03:19:48 UTC (rev 44154)
+++ trunk/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-walker-comment.php 2018-12-14 03:24:35 UTC (rev 44155)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,23 +37,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_author_url = get_comment_author_url( $comment );
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_author = get_comment_author( $comment );
</span><span class="cx" style="display: block; padding: 0 10px"> $avatar = get_avatar( $comment, $args['avatar_size'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 0 != $args['avatar_size'] ) {
- if ( empty( $comment_author_url ) ) {
- echo $avatar;
- } else {
- printf( '<a href="%s" rel="external nofollow" class="url">', $comment_author_url );
- echo $avatar;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 != $args['avatar_size'] ) {
+ if ( empty( $comment_author_url ) ) {
+ echo $avatar;
+ } else {
+ printf( '<a href="%s" rel="external nofollow" class="url">', $comment_author_url );
+ echo $avatar;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Using the `check` icon instead of `check_circle`, since we can't add a
</span><span class="cx" style="display: block; padding: 0 10px"> * fill color to the inner check shape when in circle form.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( twentynineteen_is_comment_by_post_author( $comment ) ) {
- /* translators: %s: SVG Icon */
- printf( '<span class="post-author-badge" aria-hidden="true">%s</span>', twentynineteen_get_icon_svg( 'check', 24 ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( twentynineteen_is_comment_by_post_author( $comment ) ) {
+ /* translators: %s: SVG Icon */
+ printf( '<span class="post-author-badge" aria-hidden="true">%s</span>', twentynineteen_get_icon_svg( 'check', 24 ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: comment author link */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,9 +61,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<span class="fn">%s</span>', $comment_author )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $comment_author_url ) ) {
- echo '</a>';
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $comment_author_url ) ) {
+ echo '</a>';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .comment-author -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentynineteencommentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/comments.php 2018-12-14 03:19:48 UTC (rev 44154)
+++ trunk/src/wp-content/themes/twentynineteen/comments.php 2018-12-14 03:24:35 UTC (rev 44155)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,38 +28,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="<?php echo $discussion->responses > 0 ? 'comments-title-wrap' : 'comments-title-wrap no-responses'; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <h2 class="comments-title">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( comments_open() ) {
- if ( have_comments() ) {
- _e( 'Join the Conversation', 'twentynineteen' );
- } else {
- _e( 'Leave a comment', 'twentynineteen' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( comments_open() ) {
+ if ( have_comments() ) {
+ _e( 'Join the Conversation', 'twentynineteen' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '1' == $discussion->responses ) {
- /* translators: %s: post title */
- printf( _x( 'One reply on “%s”', 'comments title', 'twentynineteen' ), get_the_title() );
- } else {
- printf(
- /* translators: 1: number of comments, 2: post title */
- _nx(
- '%1$s reply on “%2$s”',
- '%1$s replies on “%2$s”',
- $discussion->responses,
- 'comments title',
- 'twentynineteen'
- ),
- number_format_i18n( $discussion->responses ),
- get_the_title()
- );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _e( 'Leave a comment', 'twentynineteen' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ if ( '1' == $discussion->responses ) {
+ /* translators: %s: post title */
+ printf( _x( 'One reply on “%s”', 'comments title', 'twentynineteen' ), get_the_title() );
+ } else {
+ printf(
+ /* translators: 1: number of comments, 2: post title */
+ _nx(
+ '%1$s reply on “%2$s”',
+ '%1$s replies on “%2$s”',
+ $discussion->responses,
+ 'comments title',
+ 'twentynineteen'
+ ),
+ number_format_i18n( $discussion->responses ),
+ get_the_title()
+ );
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </h2><!-- .comments-title -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // Only show discussion meta information when comments are open and available.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( have_comments() && comments_open() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( have_comments() && comments_open() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> get_template_part( 'template-parts/post/discussion', 'meta' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .comments-title-flex -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentynineteenimagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/image.php 2018-12-14 03:19:48 UTC (rev 44154)
+++ trunk/src/wp-content/themes/twentynineteen/image.php 2018-12-14 03:24:35 UTC (rev 44155)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,31 +15,31 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // Start the loop.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while ( have_posts() ) :
- the_post();
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while ( have_posts() ) :
+ the_post();
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </header><!-- .entry-header -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <figure class="entry-attachment wp-block-image">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- /**
- * Filter the default twentynineteen image attachment size.
- *
- * @since Twenty Sixteen 1.0
- *
- * @param string $image_size Image size. Default 'large'.
- */
- $image_size = apply_filters( 'twentynineteen_attachment_size', 'full' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Filter the default twentynineteen image attachment size.
+ *
+ * @since Twenty Sixteen 1.0
+ *
+ * @param string $image_size Image size. Default 'large'.
+ */
+ $image_size = apply_filters( 'twentynineteen_attachment_size', 'full' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo wp_get_attachment_image( get_the_ID(), $image_size );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo wp_get_attachment_image( get_the_ID(), $image_size );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <figcaption class="wp-caption-text"><?php echo get_the_excerpt(); ?></figcaption>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,34 +46,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </figure><!-- .entry-attachment -->
</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">- the_content();
- wp_link_pages(
- array(
- 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentynineteen' ) . '</span>',
- 'after' => '</div>',
- 'link_before' => '<span>',
- 'link_after' => '</span>',
- 'pagelink' => '<span class="screen-reader-text">' . __( 'Page', 'twentynineteen' ) . ' </span>%',
- 'separator' => '<span class="screen-reader-text">, </span>',
- )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ the_content();
+ wp_link_pages(
+ array(
+ 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentynineteen' ) . '</span>',
+ 'after' => '</div>',
+ 'link_before' => '<span>',
+ 'link_after' => '</span>',
+ 'pagelink' => '<span class="screen-reader-text">' . __( 'Page', 'twentynineteen' ) . ' </span>%',
+ 'separator' => '<span class="screen-reader-text">, </span>',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <footer class="entry-footer">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- // Retrieve attachment metadata.
- $metadata = wp_get_attachment_metadata();
- if ( $metadata ) {
- printf(
- '<span class="full-size-link"><span class="screen-reader-text">%1$s</span><a href="%2$s">%3$s × %4$s</a></span>',
- _x( 'Full size', 'Used before full size attachment link.', 'twentynineteen' ),
- esc_url( wp_get_attachment_url() ),
- absint( $metadata['width'] ),
- absint( $metadata['height'] )
- );
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ // Retrieve attachment metadata.
+ $metadata = wp_get_attachment_metadata();
+ if ( $metadata ) {
+ printf(
+ '<span class="full-size-link"><span class="screen-reader-text">%1$s</span><a href="%2$s">%3$s × %4$s</a></span>',
+ _x( 'Full size', 'Used before full size attachment link.', 'twentynineteen' ),
+ esc_url( wp_get_attachment_url() ),
+ absint( $metadata['width'] ),
+ absint( $metadata['height'] )
+ );
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php twentynineteen_entry_footer(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,17 +81,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- #post-## -->
</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">- // Parent post navigation.
- the_post_navigation(
- array(
- 'prev_text' => _x( '<span class="meta-nav">Published in</span><br><span class="post-title">%title</span>', 'Parent post link', 'twentynineteen' ),
- )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Parent post navigation.
+ the_post_navigation(
+ array(
+ 'prev_text' => _x( '<span class="meta-nav">Published in</span><br><span class="post-title">%title</span>', 'Parent post link', 'twentynineteen' ),
+ )
+ );
</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 comments are open or we have at least one comment, load up the comment template.
- if ( comments_open() || get_comments_number() ) {
- comments_template();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If comments are open or we have at least one comment, load up the comment template.
+ if ( comments_open() || get_comments_number() ) {
+ comments_template();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // End the loop.
</span><span class="cx" style="display: block; padding: 0 10px"> endwhile;
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentynineteeninccolorpatternsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/inc/color-patterns.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/inc/color-patterns.php 2018-12-14 03:19:48 UTC (rev 44154)
+++ trunk/src/wp-content/themes/twentynineteen/inc/color-patterns.php 2018-12-14 03:24:35 UTC (rev 44155)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,20 +26,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $saturation Color saturation level.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $saturation = absint( apply_filters( 'twentynineteen_custom_colors_saturation', 100 ) );
- $saturation = $saturation . '%';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $saturation = absint( apply_filters( 'twentynineteen_custom_colors_saturation', 100 ) );
+ $saturation = $saturation . '%';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $saturation_selection = absint( apply_filters( 'twentynineteen_custom_colors_saturation_selection', 50 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $saturation_selection = $saturation_selection . '%';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $lightness = absint( apply_filters( 'twentynineteen_custom_colors_lightness', 33 ) );
- $lightness = $lightness . '%';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $lightness = absint( apply_filters( 'twentynineteen_custom_colors_lightness', 33 ) );
+ $lightness = $lightness . '%';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $lightness_hover = absint( apply_filters( 'twentynineteen_custom_colors_lightness_hover', 23 ) );
- $lightness_hover = $lightness_hover . '%';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $lightness_hover = absint( apply_filters( 'twentynineteen_custom_colors_lightness_hover', 23 ) );
+ $lightness_hover = $lightness_hover . '%';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $lightness_selection = absint( apply_filters( 'twentynineteen_custom_colors_lightness_selection', 90 ) );
- $lightness_selection = $lightness_selection . '%';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $lightness_selection = absint( apply_filters( 'twentynineteen_custom_colors_lightness_selection', 90 ) );
+ $lightness_selection = $lightness_selection . '%';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_css = '
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,10 +233,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> color: inherit;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $css = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $css = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'register_block_type' ) && is_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $css .= $editor_css;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( ! is_admin() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! is_admin() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $css = $theme_css;
</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="trunksrcwpcontentthemestwentynineteeninccustomizerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/inc/customizer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/inc/customizer.php 2018-12-14 03:19:48 UTC (rev 44154)
+++ trunk/src/wp-content/themes/twentynineteen/inc/customizer.php 2018-12-14 03:24:35 UTC (rev 44155)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,8 +52,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'radio',
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Primary Color', 'twentynineteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'choices' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'default' => _x( 'Default', 'primary color', 'twentynineteen' ),
- 'custom' => _x( 'Custom', 'primary color', 'twentynineteen' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'default' => _x( 'Default', 'primary color', 'twentynineteen' ),
+ 'custom' => _x( 'Custom', 'primary color', 'twentynineteen' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'colors',
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 5,
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentynineteeninctemplatefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/inc/template-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/inc/template-functions.php 2018-12-14 03:19:48 UTC (rev 44154)
+++ trunk/src/wp-content/themes/twentynineteen/inc/template-functions.php 2018-12-14 03:24:35 UTC (rev 44155)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -364,14 +364,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $mid1;
</span><span class="cx" style="display: block; padding: 0 10px"> $mid2;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $m = $l + $l - $v;
- $sv = ( $v - $m ) / $v;
- $h *= 6.0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $m = $l + $l - $v;
+ $sv = ( $v - $m ) / $v;
+ $h *= 6.0;
</ins><span class="cx" style="display: block; padding: 0 10px"> $sextant = floor( $h );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $fract = $h - $sextant;
- $vsf = $v * $sv * $fract;
- $mid1 = $m + $vsf;
- $mid2 = $v - $vsf;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fract = $h - $sextant;
+ $vsf = $v * $sv * $fract;
+ $mid1 = $m + $vsf;
+ $mid2 = $v - $vsf;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $sextant ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 0:
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentynineteeninctemplatetagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/inc/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/inc/template-tags.php 2018-12-14 03:19:48 UTC (rev 44154)
+++ trunk/src/wp-content/themes/twentynineteen/inc/template-tags.php 2018-12-14 03:24:35 UTC (rev 44155)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,8 +210,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> comment_form(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'logged_in_as' => null,
- 'title_reply' => null,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'logged_in_as' => null,
+ 'title_reply' => null,
</ins><span class="cx" style="display: block; padding: 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="trunksrcwpcontentthemestwentynineteentemplatepartscontentcontentsinglephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/template-parts/content/content-single.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/template-parts/content/content-single.php 2018-12-14 03:19:48 UTC (rev 44154)
+++ trunk/src/wp-content/themes/twentynineteen/template-parts/content/content-single.php 2018-12-14 03:24:35 UTC (rev 44155)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </footer><!-- .entry-footer -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! is_singular( 'attachment' ) ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php get_template_part( 'template-parts/post/author', 'bio' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php get_template_part( 'template-parts/post/author', 'bio' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- #post-${ID} -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentynineteentemplatepartsfooterfooterwidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/template-parts/footer/footer-widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/template-parts/footer/footer-widgets.php 2018-12-14 03:19:48 UTC (rev 44154)
+++ trunk/src/wp-content/themes/twentynineteen/template-parts/footer/footer-widgets.php 2018-12-14 03:24:35 UTC (rev 44155)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,13 +11,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <aside class="widget-area" role="complementary" aria-label="<?php esc_attr_e( 'Footer', 'twentynineteen' ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_active_sidebar( 'sidebar-1' ) ) {
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_active_sidebar( 'sidebar-1' ) ) {
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="widget-column footer-widget-1">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php dynamic_sidebar( 'sidebar-1' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php dynamic_sidebar( 'sidebar-1' ); ?>
</ins><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"> </aside><!-- .widget-area -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesembedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/embed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/embed.php 2018-12-14 03:19:48 UTC (rev 44154)
+++ trunk/src/wp-includes/embed.php 2018-12-14 03:24:35 UTC (rev 44155)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,11 +61,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Default embed parameters.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_embed_defaults( $url = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $GLOBALS['content_width'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $GLOBALS['content_width'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $width = (int) $GLOBALS['content_width'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $width ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $width ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $width = 500;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $height = min( ceil( $width * 1.5 ), 1000 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,8 +133,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_oembed_add_provider( $format, $provider, $regex = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( did_action( 'plugins_loaded' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $oembed = _wp_oembed_get_object();
- $oembed->providers[$format] = array( $provider, $regex );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $oembed = _wp_oembed_get_object();
+ $oembed->providers[ $format ] = array( $provider, $regex );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> WP_oEmbed::_add_provider_early( $format, $provider, $regex );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,7 +228,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_embed_handler_youtube( $matches, $attr, $url, $rawattr ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_embed;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $embed = $wp_embed->autoembed( sprintf( "https://youtube.com/watch?v=%s", urlencode( $matches[2] ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $embed = $wp_embed->autoembed( sprintf( 'https://youtube.com/watch?v=%s', urlencode( $matches[2] ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the YoutTube embed output.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -395,10 +397,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = rest_url( 'oembed/1.0/embed' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $permalink ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = add_query_arg( array(
- 'url' => urlencode( $permalink ),
- 'format' => ( 'json' !== $format ) ? $format : false,
- ), $url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = add_query_arg(
+ array(
+ 'url' => urlencode( $permalink ),
+ 'format' => ( 'json' !== $format ) ? $format : false,
+ ),
+ $url
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -449,7 +454,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * minified JavaScript. If you need to debug it, please turn on SCRIPT_DEBUG
</span><span class="cx" style="display: block; padding: 0 10px"> * and edit wp-embed.js directly.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output .=<<<JS
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output .= <<<JS
</ins><span class="cx" style="display: block; padding: 0 10px"> include "js/wp-embed.min.js"
</span><span class="cx" style="display: block; padding: 0 10px"> JS;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -517,10 +522,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int $max Maximum width. Default 600.
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $min_max_width = apply_filters( 'oembed_min_max_width', array(
- 'min' => 200,
- 'max' => 600
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $min_max_width = apply_filters(
+ 'oembed_min_max_width',
+ array(
+ 'min' => 200,
+ 'max' => 600,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $width = min( max( $min_max_width['min'], $width ), $min_max_width['max'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $height = max( ceil( $width / 16 * 9 ), 200 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -569,13 +577,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $switched_blog = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url_parts = wp_parse_args( wp_parse_url( $url ), array(
- 'host' => '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url_parts = wp_parse_args(
+ wp_parse_url( $url ),
+ array(
+ 'host' => '',
+ 'path' => '/',
+ )
+ );
+
+ $qv = array(
+ 'domain' => $url_parts['host'],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'path' => '/',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $qv = array( 'domain' => $url_parts['host'], 'path' => '/' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // In case of subdirectory configs, set the path.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_subdomain_install() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $path = explode( '/', ltrim( $url_parts['path'], '/' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -647,7 +661,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'attachment' === get_post_type( $post ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( wp_attachment_is_image( $post ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $thumbnail_id = $post->ID;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( wp_attachment_is( 'video', $post ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( wp_attachment_is( 'video', $post ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $thumbnail_id = get_post_thumbnail_id( $post );
</span><span class="cx" style="display: block; padding: 0 10px"> $data['type'] = 'video';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -655,9 +669,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $thumbnail_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> list( $thumbnail_url, $thumbnail_width, $thumbnail_height ) = wp_get_attachment_image_src( $thumbnail_id, array( $width, 99999 ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data['thumbnail_url'] = $thumbnail_url;
- $data['thumbnail_width'] = $thumbnail_width;
- $data['thumbnail_height'] = $thumbnail_height;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data['thumbnail_url'] = $thumbnail_url;
+ $data['thumbnail_width'] = $thumbnail_width;
+ $data['thumbnail_height'] = $thumbnail_height;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $data;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -794,7 +808,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_html = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'a' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'href' => true,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'href' => true,
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'blockquote' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'iframe' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -824,7 +838,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $secret = wp_generate_password( 10, false );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url = esc_url( "{$results[2]}#?secret=$secret" );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $q = $results[1];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $q = $results[1];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $html = str_replace( $results[0], ' src=' . $q . $url . $q . ' data-secret=' . $q . $secret . $q, $html );
</span><span class="cx" style="display: block; padding: 0 10px"> $html = str_replace( '<blockquote', "<blockquote data-secret=\"$secret\"", $html );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -831,7 +845,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_html['blockquote']['data-secret'] = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $allowed_html['iframe']['data-secret'] = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_html['iframe']['data-secret'] = true;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $html = wp_kses( $html, $allowed_html );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -862,7 +876,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $more_string;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link = sprintf( '<a href="%1$s" class="wp-embed-more" target="_top">%2$s</a>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link = sprintf(
+ '<a href="%1$s" class="wp-embed-more" target="_top">%2$s</a>',
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url( get_permalink() ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Name of current post */
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( __( 'Continue reading %s' ), '<span class="screen-reader-text">' . get_the_title() . '</span>' )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -938,23 +953,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <style type="text/css">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( SCRIPT_DEBUG ) {
- readfile( ABSPATH . WPINC . "/css/wp-embed-template.css" );
- } else {
- /*
- * If you're looking at a src version of this file, you'll see an "include"
- * statement below. This is used by the `grunt build` process to directly
- * include a minified version of wp-oembed-embed.css, instead of using the
- * readfile() method from above.
- *
- * If you're looking at a build version of this file, you'll see a string of
- * minified CSS. If you need to debug it, please turn on SCRIPT_DEBUG
- * and edit wp-embed-template.css directly.
- */
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( SCRIPT_DEBUG ) {
+ readfile( ABSPATH . WPINC . '/css/wp-embed-template.css' );
+ } else {
+ /*
+ * If you're looking at a src version of this file, you'll see an "include"
+ * statement below. This is used by the `grunt build` process to directly
+ * include a minified version of wp-oembed-embed.css, instead of using the
+ * readfile() method from above.
+ *
+ * If you're looking at a build version of this file, you'll see a string of
+ * minified CSS. If you need to debug it, please turn on SCRIPT_DEBUG
+ * and edit wp-embed-template.css directly.
+ */
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> include "css/wp-embed-template.min.css"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- }
</del><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"> </style>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -969,23 +984,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( SCRIPT_DEBUG ) {
- readfile( ABSPATH . WPINC . "/js/wp-embed-template.js" );
- } else {
- /*
- * If you're looking at a src version of this file, you'll see an "include"
- * statement below. This is used by the `grunt build` process to directly
- * include a minified version of wp-embed-template.js, instead of using the
- * readfile() method from above.
- *
- * If you're looking at a build version of this file, you'll see a string of
- * minified JavaScript. If you need to debug it, please turn on SCRIPT_DEBUG
- * and edit wp-embed-template.js directly.
- */
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( SCRIPT_DEBUG ) {
+ readfile( ABSPATH . WPINC . '/js/wp-embed-template.js' );
+ } else {
+ /*
+ * If you're looking at a src version of this file, you'll see an "include"
+ * statement below. This is used by the `grunt build` process to directly
+ * include a minified version of wp-embed-template.js, instead of using the
+ * readfile() method from above.
+ *
+ * If you're looking at a build version of this file, you'll see a string of
+ * minified JavaScript. If you need to debug it, please turn on SCRIPT_DEBUG
+ * and edit wp-embed-template.js directly.
+ */
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> include "js/wp-embed-template.min.js"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- }
</del><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"> </script>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="trunktestsphpunittestsoembedcontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/oembed/controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/controller.php 2018-12-14 03:19:48 UTC (rev 44154)
+++ trunk/tests/phpunit/tests/oembed/controller.php 2018-12-14 03:24:35 UTC (rev 44155)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,8 +12,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $editor;
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $administrator;
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $subscriber;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const YOUTUBE_VIDEO_ID = 'OQSNhk5ICTI';
- const INVALID_OEMBED_URL = 'https://www.notreallyanoembedprovider.com/watch?v=awesome-cat-video';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const YOUTUBE_VIDEO_ID = 'OQSNhk5ICTI';
+ const INVALID_OEMBED_URL = 'https://www.notreallyanoembedprovider.com/watch?v=awesome-cat-video';
</ins><span class="cx" style="display: block; padding: 0 10px"> const UNTRUSTED_PROVIDER_URL = 'https://www.untrustedprovider.com';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public static function wpSetUpBeforeClass( $factory ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,13 +137,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'body' => wp_json_encode(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'version' => '1.0',
- 'type' => 'rich',
- 'provider_name' => 'Untrusted',
- 'provider_url' => self::UNTRUSTED_PROVIDER_URL,
- 'html' => '<b>Filtered</b><a href="">Unfiltered</a>',
- 'author_name' => 'Untrusted Embed Author',
- 'title' => 'Untrusted Embed',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'version' => '1.0',
+ 'type' => 'rich',
+ 'provider_name' => 'Untrusted',
+ 'provider_url' => self::UNTRUSTED_PROVIDER_URL,
+ 'html' => '<b>Filtered</b><a href="">Unfiltered</a>',
+ 'author_name' => 'Untrusted Embed Author',
+ 'title' => 'Untrusted Embed',
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -651,13 +651,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_proxy_with_internal_url() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$editor );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = self::factory()->user->create_and_get( array(
- 'display_name' => 'John Doe',
- ) );
- $post = self::factory()->post->create_and_get( array(
- 'post_author' => $user->ID,
- 'post_title' => 'Hello World',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = self::factory()->user->create_and_get(
+ array(
+ 'display_name' => 'John Doe',
+ )
+ );
+ $post = self::factory()->post->create_and_get(
+ array(
+ 'post_author' => $user->ID,
+ 'post_title' => 'Hello World',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', '/oembed/1.0/proxy' );
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'url', get_permalink( $post->ID ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -695,11 +699,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_proxy_with_static_front_page_url() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$editor );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = self::factory()->post->create_and_get( array(
- 'post_title' => 'Front page',
- 'post_type' => 'page',
- 'post_author' => 0,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::factory()->post->create_and_get(
+ array(
+ 'post_title' => 'Front page',
+ 'post_type' => 'page',
+ 'post_author' => 0,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'show_on_front', 'page' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'page_on_front', $post->ID );
</span></span></pre>
</div>
</div>
</body>
</html>