<!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>[935] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types: Add speaker information to sessions posts and vice versa.</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" 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/935">935</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/935","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>2014-10-25 06:00:53 +0000 (Sat, 25 Oct 2014)</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'>Add speaker information to sessions posts and vice versa.
props codebykat</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypescssshortcodescss">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/css/shortcodes.css</a></li>
<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_htmlwpcontentpluginswcposttypescssshortcodescss"></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/plugins/wc-post-types/css/shortcodes.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/css/shortcodes.css 2014-10-25 05:00:50 UTC (rev 934)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/css/shortcodes.css 2014-10-25 06:00:53 UTC (rev 935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,3 +73,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> color: #21759b;
</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">+
+/*
+ * [sessions]
+ * [speakers]
+ */
+#session-speaker-names,
+#speaker-session-names {
+ margin-left: 0;
+}
+
+ #session-speaker-names li,
+ #speaker-session-names li {
+ list-style-type: none;
+ }
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypeswcposttypesphp"></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/plugins/wc-post-types/wc-post-types.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/plugins/wc-post-types/wc-post-types.php 2014-10-25 05:00:50 UTC (rev 934)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php 2014-10-25 06:00:53 UTC (rev 935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,6 +46,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_shortcode( 'schedule', array( $this, 'shortcode_schedule' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_content', array( $this, 'add_avatar_to_speaker_posts' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'the_content', array( $this, 'add_speaker_info_to_session_posts' ) );
+ add_filter( 'the_content', array( $this, 'add_session_info_to_speaker_posts' ) );
</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"> function init() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,7 +197,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"> function wp_enqueue_scripts() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_enqueue_style( 'wcb_shortcodes', plugins_url( 'css/shortcodes.css', __FILE__ ), array(), 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_enqueue_style( 'wcb_shortcodes', plugins_url( 'css/shortcodes.css', __FILE__ ), array(), 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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1074,6 +1076,131 @@
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Add speaker information to Session posts
+ *
+ * We don't enable it for sites that were created before it was committed, because some will have already
+ * crafted the bio to include this content, so duplicating it would look wrong, but we still allow older
+ * sites to opt-in.
+ *
+ * @param string $content
+ *
+ * @return string
+ */
+ function add_speaker_info_to_session_posts( $content ) {
+ global $post;
+ $enabled_site_ids = array( 364 ); // 2014.sf
+
+ if ( 'wcb_session' !== $post->post_type ) {
+ return $content;
+ }
+
+ $site_id = get_current_blog_id();
+ if ( $site_id <= 463 && ! in_array( $site_id, $enabled_site_ids ) ) {
+ return $content;
+ }
+
+ $speaker_ids = (array) get_post_meta( $post->ID, '_wcpt_speaker_id' );
+
+ if ( empty ( $speaker_ids ) ) {
+ return $content;
+ }
+
+ $speaker_args = array(
+ 'post_type' => 'wcb_speaker',
+ 'posts_per_page' => -1,
+ 'post__in' => $speaker_ids,
+ 'orderby' => 'title',
+ 'order' => 'asc',
+ );
+
+ $speakers = new WP_Query( $speaker_args );
+
+ if ( ! $speakers->have_posts() ) {
+ return $content;
+ }
+
+ $speakers_html = sprintf(
+ '<h2 class="session-speakers">%s</h2>',
+ _n(
+ __( 'Speaker', 'wordcamporg' ),
+ __( 'Speakers', 'wordcamporg' ),
+ $speakers->post_count
+ )
+ );
+
+ $speakers_html .= '<ul id="session-speaker-names">';
+ while ( $speakers->have_posts() ) {
+ $speakers->the_post();
+ $speakers_html .= sprintf( '<li><a href="%s">%s</a></li>', get_the_permalink(), get_the_title() );
+ }
+ $speakers_html .= '</ul>';
+
+ wp_reset_postdata();
+
+ return $content . $speakers_html;
+ }
+
+ /**
+ * Add session information to Speaker posts
+ *
+ * We don't enable it for sites that were created before it was committed, because some will have already
+ * crafted the bio to include this content, so duplicating it would look wrong, but we still allow older
+ * sites to opt-in.
+ *
+ * @param string $content
+ *
+ * @return string
+ */
+ function add_session_info_to_speaker_posts( $content ) {
+ global $post;
+ $enabled_site_ids = array( 364 ); // 2014.sf
+
+ if ( 'wcb_speaker' !== $post->post_type ) {
+ return $content;
+ }
+
+ $site_id = get_current_blog_id();
+ if ( $site_id <= 463 && ! in_array( $site_id, $enabled_site_ids ) ) {
+ return $content;
+ }
+
+ $session_args = array(
+ 'post_type' => 'wcb_session',
+ 'posts_per_page' => -1,
+ 'meta_key' => '_wcpt_speaker_id',
+ 'meta_value' => $post->ID,
+ 'orderby' => 'title',
+ 'order' => 'asc',
+ );
+
+ $sessions = new WP_Query( $session_args );
+
+ if ( ! $sessions->have_posts() ) {
+ return $content;
+ }
+
+ $sessions_html = sprintf(
+ '<h2 class="speaker-sessions">%s</h2>',
+ _n(
+ __( 'Session', 'wordcamporg' ),
+ __( 'Sessions', 'wordcamporg' ),
+ $sessions->post_count
+ )
+ );
+
+ $sessions_html .= '<ul id="speaker-session-names">';
+ while ( $sessions->have_posts() ) {
+ $sessions->the_post();
+ $sessions_html .= sprintf( '<li><a href="%s">%s</a></li>', get_the_permalink(), get_the_title() );
+ }
+ $sessions_html .= '</ul>';
+
+ wp_reset_postdata();
+
+ return $content . $sessions_html;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Fired during add_meta_boxes, adds extra meta boxes to our custom post types.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function add_meta_boxes() {
</span></span></pre>
</div>
</div>
</body>
</html>