<!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>[104] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php: Post Types: Simulate track for [schedule] shortcode if none exist.</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/104">104</a></dd>
<dt>Author</dt> <dd>iandunn</dd>
<dt>Date</dt> <dd>2013-10-15 19:28:34 +0000 (Tue, 15 Oct 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Post Types: Simulate track for [schedule] shortcode if none exist.
Previously the [schedule] shortcode assumed that tracks were created and that sessions were assigned to them, and wouldn't properly display sessions if no tracks existed. Now, if no tracks exist, the shortcode will simulate a generic one and show all sessions within it.</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 (103 => 104)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php 2013-10-11 13:22:41 UTC (rev 103)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php 2013-10-15 19:28:34 UTC (rev 104)
</span><span class="lines">@@ -404,13 +404,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Use tracks to form the columns.
</span><del>- foreach ( $tracks as $track )
- $columns[ $track->term_id ] = $track->term_id;
</del><ins>+ if ( $tracks ) {
+ foreach ( $tracks as $track )
+ $columns[ $track->term_id ] = $track->term_id;
+ } else {
+ $columns[ 0 ] = 0;
+ }
</ins><span class="cx">
</span><span class="cx"> unset( $tracks );
</span><span class="cx">
</span><span class="cx"> // Loop through all sessions and assign them into the formatted
</span><span class="cx"> // $sessions array: $sessions[ $time ][ $track ] = $session_id
</span><ins>+ // Use 0 as the track ID if no tracks exist
</ins><span class="cx">
</span><span class="cx"> $sessions = array();
</span><span class="cx"> $sessions_query = new WP_Query( $query_args );
</span><span class="lines">@@ -421,9 +426,12 @@
</span><span class="cx"> if ( ! isset( $sessions[ $time ] ) )
</span><span class="cx"> $sessions[ $time ] = array();
</span><span class="cx">
</span><del>- if ( ! empty( $tracks ) )
</del><ins>+ if ( empty( $tracks ) ) {
+ $sessions[ $time ][ 0 ] = $session->ID;
+ } else {
</ins><span class="cx"> foreach ( $tracks as $track )
</span><span class="cx"> $sessions[ $time ][ $track->term_id ] = $session->ID;
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Sort all sessions by their key (timestamp).
</span><span class="lines">@@ -450,7 +458,11 @@
</span><span class="cx"> $html .= '<th class="wcpt-col-time">Time</th>';
</span><span class="cx"> foreach ( $columns as $term_id ) {
</span><span class="cx"> $track = get_term( $term_id, 'wcb_track' );
</span><del>- $html .= sprintf( '<th class="wcpt-col-track"><span class="wcpt-track-name">%s</span> <span class="wcpt-track-description">%s</span></th>', esc_html( $track->name ), esc_html( $track->description ) );
</del><ins>+ $html .= sprintf(
+ '<th class="wcpt-col-track"> <span class="wcpt-track-name">%s</span> <span class="wcpt-track-description">%s</span> </th>',
+ isset( $track->term_id ) ? esc_html( $track->name ) : '',
+ isset( $track->term_id ) ? esc_html( $track->description ) : ''
+ );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $html .= '</tr>';
</span></span></pre>
</div>
</div>
</body>
</html>