<!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>[8614] sites/trunk/wordcamp.org: WordCamp Blocks: Apply PHP coding standards.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/8614">8614</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/8614","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-04-09 19:49:49 +0000 (Tue, 09 Apr 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WordCamp Blocks: Apply PHP coding standards.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgphpcsxmldist">sites/trunk/wordcamp.org/phpcs.xml.dist</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksincludessessionsphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/sessions.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksincludessharedfeaturedimagephp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/shared/featured-image.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksincludessharedgridlayoutphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/shared/grid-layout.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksincludessponsorsphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/sponsors.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksvieworganizersphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/organizers.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksviewsessionsphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/sessions.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksviewspeakersphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/speakers.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgphpcsxmldist"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/phpcs.xml.dist</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/phpcs.xml.dist 2019-04-09 19:49:45 UTC (rev 8613)
+++ sites/trunk/wordcamp.org/phpcs.xml.dist 2019-04-09 19:49:49 UTC (rev 8614)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,6 +67,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_*() cachebusters should use filemtime() rather than a hardcoded int.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> Combine similar `use` statements on the same line. Like, all the core PHP objects, then all the WP objects on the 2nd line, then our custom objects on the 3rd line, etc.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ Prevent blank lines at start of function/class
</ins><span class="cx" style="display: block; padding: 0 10px"> -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,13 +114,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <exclude name="PEAR.Functions.FunctionCallSignature.ContentAfterOpenBracket" />
</span><span class="cx" style="display: block; padding: 0 10px"> <exclude name="PEAR.Functions.FunctionCallSignature.CloseBracketLine" />
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <!-- todo get_speaker_from_user_id() meta_query should not have to line up with post_status
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <!--
+ ... In multidimensional arrays, items in the child arrays should be aligned, but the parent arrays should
+ ... not be aligned, since they are not on neighboring lines.
+ ...
+ ... @todo This isn't working, see `WordCamp\Blocks\Sessions\get_attributes_schema()`.
+ ... @see https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/issues/1565
+ -->
</ins><span class="cx" style="display: block; padding: 0 10px"> <rule ref="WordPress.Arrays.MultipleStatementAlignment">
</span><span class="cx" style="display: block; padding: 0 10px"> <properties>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <property name="alignMultilineItems" value="never" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <property name="alignMultilineItems" value="!=100"/>
</ins><span class="cx" style="display: block; padding: 0 10px"> </properties>
</span><span class="cx" style="display: block; padding: 0 10px"> </rule>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- -->
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Warn about mis-aligned array items, but don't automatically "fix" them, because arrays in function calls get extra lines added.
</span><span class="cx" style="display: block; padding: 0 10px"> See https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/issues/1305 -->
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksincludessessionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/sessions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/sessions.php 2019-04-09 19:49:45 UTC (rev 8613)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/sessions.php 2019-04-09 19:49:49 UTC (rev 8614)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function render( $attributes ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! $attributes['mode'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,6 +68,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $rendered_session_posts,
</span><span class="cx" style="display: block; padding: 0 10px"> $container_classes
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $html;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,12 +97,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_attributes_schema() {
</span><span class="cx" style="display: block; padding: 0 10px"> return [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mode' => [
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mode' => [
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="cx" style="display: block; padding: 0 10px"> 'enum' => wp_list_pluck( get_options( 'mode' ), 'value' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'item_ids' => [
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 'item_ids' => [
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'array',
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => [],
</span><span class="cx" style="display: block; padding: 0 10px"> 'items' => [
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,68 +110,82 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'integer',
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'sort' => [
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 'sort' => [
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="cx" style="display: block; padding: 0 10px"> 'enum' => wp_list_pluck( get_options( 'sort' ), 'value' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => 'session_time',
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'className' => [
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 'className' => [
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'show_speaker' => [
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 'show_speaker' => [
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'bool',
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'show_images' => [
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 'show_images' => [
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'bool',
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image_size' => [
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 'image_size' => [
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'integer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'minimum' => 25,
</span><span class="cx" style="display: block; padding: 0 10px"> 'maximum' => 600,
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => 150,
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'image_align' => [
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 'image_align' => [
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="cx" style="display: block; padding: 0 10px"> 'enum' => wp_list_pluck( get_options( 'align' ), 'value' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => 'none',
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'content' => [
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 'content' => [
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="cx" style="display: block; padding: 0 10px"> 'enum' => wp_list_pluck( get_options( 'content' ), 'value' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => 'full',
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'excerpt_more' => [
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 'excerpt_more' => [
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'bool',
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'show_meta' => [
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 'show_meta' => [
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'bool',
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_category' => [
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'bool',
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> 'layout' => [
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="cx" style="display: block; padding: 0 10px"> 'enum' => array( 'list', 'grid' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => 'list',
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> 'grid_columns' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'type' => 'integer',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'type' => 'integer',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'minimum' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'maximum' => 4,
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> 'featured_image_height' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'type' => 'integer',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'type' => 'integer',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => 150,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> 'featured_image_width' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'type' => 'integer',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'type' => 'integer',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => 150,
</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="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksincludessharedfeaturedimagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/shared/featured-image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/shared/featured-image.php 2019-04-09 19:49:45 UTC (rev 8613)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/shared/featured-image.php 2019-04-09 19:49:49 UTC (rev 8614)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,20 +12,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Output markup for featured image.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function render_featured_image( $class_names, $post, $width, $image_link = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class_names[] = 'wordcamp-featured-image';
- $class_names = implode( ' ', $class_names );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class_names[] = 'wordcamp-featured-image';
+ $class_names = implode( ' ', $class_names );
</ins><span class="cx" style="display: block; padding: 0 10px"> $container_classes = "wordcamp-image-container wordcamp-featured-image-container $class_names";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = get_post_thumbnail_id( $post->ID );
- $image_data = wp_get_attachment_metadata( $attachment_id );
- $size = 'post-thumbnail';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = get_post_thumbnail_id( $post->ID );
+ $image_data = wp_get_attachment_metadata( $attachment_id );
+ $size = 'post-thumbnail';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $image_data ) && isset( $image_data['sizes'] ) && isset( $image_data['sizes']['full'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $aspect_ratio = $image_data['sizes']['full']['height'] / $image_data['sizes']['full']['width'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $height = $aspect_ratio * $width;
- $size = array( $width, $height );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $height = $aspect_ratio * $width;
+ $size = array( $width, $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"> $image = render_featured_image_element( $post, $size, $class_names );
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</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"> <div class="<?php echo esc_attr( $container_classes ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( '' !== $image_link ) { ?>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksincludessharedgridlayoutphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/shared/grid-layout.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/shared/grid-layout.php 2019-04-09 19:49:45 UTC (rev 8613)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/shared/grid-layout.php 2019-04-09 19:49:49 UTC (rev 8614)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,17 +24,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'grid' === $layout ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $container_classes[] = 'grid-columns-' . absint( $columns );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $container_classes = implode( ' ', $container_classes );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul class="<?php echo esc_attr( $container_classes ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $children as $child ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="wordcamp-block-post-list-item wordcamp-grid-layout-item wordcamp-clearfix">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( wp_kses_post( $child ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo wp_kses_post( $child ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return ob_get_clean();
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksincludessponsorsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/sponsors.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/sponsors.php 2019-04-09 19:49:45 UTC (rev 8613)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/sponsors.php 2019-04-09 19:49:49 UTC (rev 8614)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,8 +127,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return function ( $sponsor1, $sponsor2 ) use ( $sponsor_level_order, $sponsor_terms_cache ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $index1 = array_search( $sponsor_terms_cache[ $sponsor1->ID ], $sponsor_level_order );
- $index2 = array_search( $sponsor_terms_cache[ $sponsor2->ID ], $sponsor_level_order );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $index1 = array_search( $sponsor_terms_cache[ $sponsor1->ID ], $sponsor_level_order, true );
+ $index2 = array_search( $sponsor_terms_cache[ $sponsor2->ID ], $sponsor_level_order, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $index1 && false === $index2 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return 0;
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksvieworganizersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/organizers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/organizers.php 2019-04-09 19:49:45 UTC (rev 8613)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/organizers.php 2019-04-09 19:49:49 UTC (rev 8614)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="wordcamp-block-post-list-item wordcamp-organizer wordcamp-organizer-<?php echo sanitize_html_class( $organizer->post_name ); ?> wordcamp-clearfix">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3 class="wordcamp-item-title wordcamp-organizer-title">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo esc_url( get_permalink( $organizer ) ); ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo get_the_title( $organizer ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo wp_kses_post( get_the_title( $organizer ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </h3>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( 'none' !== $attributes['content'] ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wordcamp-item-content wordcamp-organizer-content-<?php echo esc_attr( $attributes['content'] ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( 'full' === $attributes['content'] ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo wpautop( get_all_the_content( $organizer ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo wp_kses_post( wpautop( get_all_the_content( $organizer ) ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="wordcamp-item-permalink">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo esc_url( get_permalink( $organizer ) ); ?>">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksviewsessionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/sessions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/sessions.php 2019-04-09 19:49:45 UTC (rev 8613)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/sessions.php 2019-04-09 19:49:49 UTC (rev 8614)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,15 +1,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> namespace WordCamp\Blocks\Sessions;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-defined( 'WPINC' ) || die();
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use WP_Post;
</ins><span class="cx" style="display: block; padding: 0 10px"> use function WordCamp\Blocks\Shared\{ get_all_the_content, array_to_human_readable_list };
</span><span class="cx" style="display: block; padding: 0 10px"> use function WordCamp\Blocks\Shared\Components\{ render_featured_image };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/** @var array $attributes */
-/** @var \WP_Post $session */
-/** @var array $speakers */
-/** @var string $container_classes */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+defined( 'WPINC' ) || die();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/** @var array $attributes */
+/** @var WP_Post $session */
+/** @var array $speakers */
+/** @var string $container_classes */
+
</ins><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( $session );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,6 +35,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $speakers[ $session->ID ]
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="wordcamp-item-meta wordcamp-session-speakers">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,6 +67,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php esc_html_e( 'Visit session page', 'wordcamporg' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( 'excerpt' === $attributes['content'] ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_kses_post( wpautop( the_excerpt() ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( true === $attributes['excerpt_more'] ) : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,9 +83,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $attributes['show_meta'] || $attributes['show_category'] ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wordcamp-item-meta wordcamp-session-details">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $attributes['show_meta'] ) :
- $tracks = get_the_terms( $session, 'wcb_track' );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $attributes['show_meta'] ) : ?>
+ <?php $tracks = get_the_terms( $session, 'wcb_track' ); ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="wordcamp-session-time-location">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! is_wp_error( $tracks ) && ! empty( $tracks ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,6 +99,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> esc_html( $tracks[0]->name )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> else :
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: A date; 2: A time; */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,6 +110,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $attributes['show_category'] && has_term( null, 'wcb_session_category', $session ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> $categories = array_map(
</span><span class="cx" style="display: block; padding: 0 10px"> function( $category ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,9 +123,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> get_the_terms( $session, 'wcb_session_category' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="wordcamp-session-categories">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php /* translators: used between list items, there is a space after the comma */
- echo implode( esc_html__( ', ', 'wordcamporg' ), $categories ); // phpcs:ignore WordPress.Security.EscapeOutput
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /* translators: used between list items, there is a space after the comma */
+ echo wp_kses_post( implode( __( ', ', 'wordcamporg' ), $categories ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksviewspeakersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/speakers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/speakers.php 2019-04-09 19:49:45 UTC (rev 8613)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/speakers.php 2019-04-09 19:49:49 UTC (rev 8614)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,11 +13,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! empty( $speakers ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul class="<?php echo esc_attr( $container_classes ); ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php foreach ( $speakers as $speaker ) : setup_postdata( $speaker ); // phpcs:ignore Squiz.ControlStructures.ControlSignature ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php foreach ( $speakers as $speaker ) : ?>
+ <?php setup_postdata( $speaker ); ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <li class="wordcamp-block-post-list-item wordcamp-speaker wordcamp-speaker-<?php echo sanitize_html_class( $speaker->post_name ); ?> wordcamp-clearfix">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3 class="wordcamp-item-title wordcamp-speaker-title">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo esc_url( get_permalink( $speaker ) ); ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo get_the_title( $speaker ); // phpcs:ignore WordPress.Security.EscapeOutput ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo wp_kses_post( get_the_title( $speaker ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </h3>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,8 +26,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( true === $attributes['show_avatars'] ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wordcamp-speaker-avatar-container align-<?php echo esc_attr( $attributes['avatar_align'] ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo esc_url( get_permalink( $speaker ) ); ?>" class="wordcamp-speaker-avatar-link">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- echo get_avatar(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo get_avatar(
</ins><span class="cx" style="display: block; padding: 0 10px"> $speaker->_wcb_speaker_email,
</span><span class="cx" style="display: block; padding: 0 10px"> $attributes['avatar_size'],
</span><span class="cx" style="display: block; padding: 0 10px"> '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,8 +35,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'class' => 'wordcamp-speaker-avatar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'force_display' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> ]
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,14 +43,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( 'none' !== $attributes['content'] ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wordcamp-item-content wordcamp-speaker-content-<?php echo esc_attr( $attributes['content'] ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( 'full' === $attributes['content'] ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo wpautop( get_all_the_content( $speaker ) ); // phpcs:ignore WordPress.Security.EscapeOutput ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo wp_kses_post( wpautop( get_all_the_content( $speaker ) ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="wordcamp-item-permalink">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo esc_url( get_permalink( $speaker ) ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php esc_html_e( 'Visit speaker page', 'wordcamporg' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( 'excerpt' === $attributes['content'] ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wpautop( the_excerpt() ); ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( true === $attributes['excerpt_more'] ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="wordcamp-item-permalink">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo esc_url( get_permalink( $speaker ) ); ?>" class="wordcamp-speaker-permalink">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,13 +71,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </h4>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul class="wordcamp-speaker-sessions-list">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php foreach ( $sessions[ $speaker->ID ] as $session ) :
- $tracks = get_the_terms( $session, 'wcb_track' );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php foreach ( $sessions[ $speaker->ID ] as $session ) : ?>
+ <?php $tracks = get_the_terms( $session, 'wcb_track' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <li class="wordcamp-speaker-session-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <a class="wordcamp-speaker-session-link" href="<?php echo esc_url( get_permalink( $session ) ); ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo get_the_title( $session ); // phpcs:ignore WordPress.Security.EscapeOutput ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo wp_kses_post( get_the_title( $session ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="wordcamp-speaker-session-info">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! is_wp_error( $tracks ) && ! empty( $tracks ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,6 +89,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> esc_html( $tracks[0]->name )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +106,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php endforeach; wp_reset_postdata(); // phpcs:ignore Generic.Formatting.DisallowMultipleStatements,Squiz.PHP.EmbeddedPhp ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endforeach; ?>
+ <?php wp_reset_postdata(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span></span></pre>
</div>
</div>
</body>
</html>