<!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>[779] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php: WordCamp Post Types: Add 'track' parameter to [speakers] shortcode.</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 { 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">
<dt>Revision</dt> <dd><a href="http://meta.trac.wordpress.org/changeset/779">779</a></dd>
<dt>Author</dt> <dd>iandunn</dd>
<dt>Date</dt> <dd>2014-08-11 19:10:43 +0000 (Mon, 11 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WordCamp Post Types: Add 'track' parameter to [speakers] shortcode.
The id attribute on each speaker div is now deprecated, because the shortcode now supports use cases where the
shortcode is used multiple times on a single page, and assigning duplicate IDs violates the HTML spec.
Fixes <a href="http://meta.trac.wordpress.org/ticket/561">#561</a>
props hlashbrooke</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypeswcposttypesphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypeswcposttypesphp"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php (778 => 779)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php 2014-08-04 20:13:24 UTC (rev 778)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php 2014-08-11 19:10:43 UTC (rev 779)
</span><span class="lines">@@ -249,28 +249,85 @@
</span><span class="cx"> function shortcode_speakers( $attr, $content ) {
</span><span class="cx"> global $post;
</span><span class="cx">
</span><ins>+ // Prepare the shortcode arguments
</ins><span class="cx"> $attr = shortcode_atts( array(
</span><span class="cx"> 'show_avatars' => true,
</span><span class="cx"> 'avatar_size' => 100,
</span><span class="cx"> 'posts_per_page' => -1,
</span><span class="cx"> 'orderby' => 'date',
</span><span class="cx"> 'order' => 'desc',
</span><ins>+ 'track' => 'all',
</ins><span class="cx"> ), $attr );
</span><span class="cx">
</span><span class="cx"> $attr['show_avatars'] = $this->str_to_bool( $attr['show_avatars'] );
</span><span class="cx"> $attr['orderby'] = ( in_array( $attr['orderby'], array( 'date', 'title', 'rand' ) ) ) ? $attr['orderby'] : 'date';
</span><span class="cx"> $attr['order'] = ( in_array( $attr['order'], array( 'asc', 'desc') ) ) ? $attr['order'] : 'desc';
</span><span class="cx">
</span><del>- $speakers = new WP_Query( array(
</del><ins>+ /*
+ * Only allow 2014.capetown to use the new track attribute
+ * @todo Remove this and update docs after stakeholder review
+ */
+ if ( ! in_array( get_current_blog_id(), apply_filters( 'wcpt_filter_speakers_by_track_allowed_sites', array( 423 ) ) ) ) {
+ $attr['track'] = 'all';
+ }
+
+ // Fetch all the relevant sessions
+ $session_args = array(
+ 'post_type' => 'wcb_session',
+ 'posts_per_page' => -1,
+ );
+
+ if ( 'all' != $attr['track'] ) {
+ $session_args['tax_query'] = array(
+ array(
+ 'taxonomy' => 'wcb_track',
+ 'field' => 'slug',
+ 'terms' => explode( ',', $attr['track'] ),
+ ),
+ );
+ }
+
+ $sessions = get_posts( $session_args );
+
+ // Parse the sessions
+ $speaker_ids = $speakers_tracks = array();
+ foreach ( $sessions as $session ) {
+ // Get the speaker IDs for all the sessions in the requested tracks
+ $session_speaker_ids = get_post_meta( $session->ID, '_wcpt_speaker_id' );
+ $speaker_ids = array_merge( $speaker_ids, $session_speaker_ids );
+
+ // Map speaker IDs to their corresponding tracks
+ $session_terms = wp_get_object_terms( $session->ID, 'wcb_track' );
+ foreach ( $session_speaker_ids as $speaker_id ) {
+ if ( isset ( $speakers_tracks[ $speaker_id ] ) ) {
+ $speakers_tracks[ $speaker_id ] = array_merge( $speakers_tracks[ $speaker_id ], wp_list_pluck( $session_terms, 'slug' ) );
+ } else {
+ $speakers_tracks[ $speaker_id ] = wp_list_pluck( $session_terms, 'slug' );
+ }
+ }
+ }
+
+ // Remove duplicate entries
+ $speaker_ids = array_unique( $speaker_ids );
+ foreach ( $speakers_tracks as $speaker_id => $tracks ) {
+ $speakers_tracks[ $speaker_id ] = array_unique( $tracks );
+ }
+
+ // Fetch all specified speakers
+ $speaker_args = array(
</ins><span class="cx"> 'post_type' => 'wcb_speaker',
</span><span class="cx"> 'posts_per_page' => intval( $attr['posts_per_page'] ),
</span><ins>+ 'post__in' => $speaker_ids,
</ins><span class="cx"> 'orderby' => $attr['orderby'],
</span><span class="cx"> 'order' => $attr['order'],
</span><del>- ) );
</del><ins>+ );
</ins><span class="cx">
</span><ins>+ $speakers = new WP_Query( $speaker_args );
+
</ins><span class="cx"> if ( ! $speakers->have_posts() )
</span><span class="cx"> return '';
</span><span class="cx">
</span><ins>+ // Render the HTML for the shortcode
</ins><span class="cx"> ob_start();
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="lines">@@ -278,23 +335,30 @@
</span><span class="cx">
</span><span class="cx"> <?php while ( $speakers->have_posts() ) : $speakers->the_post(); ?>
</span><span class="cx">
</span><del>- <div id="wcorg-speaker-<?php echo sanitize_html_class( $post->post_name ); ?>" class="wcorg-speaker">
</del><ins>+ <?php
+ $speaker_classes = array( 'wcorg-speaker', 'wcorg-speaker-' . sanitize_html_class( $post->post_name ) );
+ foreach ( $speakers_tracks[ get_the_ID() ] as $track ) {
+ $speaker_classes[] = sanitize_html_class( 'wcorg-track-' . $track );
+ }
+ ?>
+
+ <!-- Organizers note: The id attribute is deprecated and only remains for backwards compatibility, please use the corresponding class to target individual speakers -->
+ <div id="wcorg-speaker-<?php echo sanitize_html_class( $post->post_name ); ?>" class="<?php echo implode( ' ', $speaker_classes ); ?>">
</ins><span class="cx"> <h2><?php the_title(); ?></h2>
</span><span class="cx"> <div class="wcorg-speaker-description">
</span><span class="cx"> <?php echo ( $attr['show_avatars'] ) ? get_avatar( get_post_meta( get_the_ID(), '_wcb_speaker_email', true ), absint( $attr['avatar_size'] ) ) : ''; ?>
</span><span class="cx"> <?php the_content(); ?>
</span><span class="cx"> </div>
</span><del>- </div>
</del><ins>+ </div><!-- .wcorg-speaker -->
</ins><span class="cx">
</span><span class="cx"> <?php endwhile; ?>
</span><span class="cx">
</span><span class="cx"> </div><!-- .wcorg-speakers -->
</span><ins>+
</ins><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> wp_reset_postdata();
</span><del>- $content = ob_get_contents();
- ob_end_clean();
- return $content;
</del><ins>+ return ob_get_clean();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>