<!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>[4038] sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012: Central Theme: Convert to Unix line endings and strip trailing spaces</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/4038">4038</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/4038","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>2016-09-12 19:10:09 +0000 (Mon, 12 Sep 2016)</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'>Central Theme: Convert to Unix line endings and strip trailing spaces</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012archivephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/archive.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012authorphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/author.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012categoryphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/category.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012contentphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/content.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012editorstylecss">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/editor-style.css</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012footerphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/footer.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012headerphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/header.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012indexphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/index.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012loopattachmentphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/loop-attachment.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012navigationabovephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/navigation-above.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012navigationbelowphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/navigation-below.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012pagephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/page.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012searchphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/search.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012sidebarblogphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/sidebar-blog.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012sidebarfooterphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/sidebar-footer.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012sidebarpagephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/sidebar-page.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012singlemesphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/single-mes.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012singlewordcampphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/single-wordcamp.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012singlephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/single.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012tagphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/tag.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012templatehomephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/template-home.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012templatepastwordcampsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/template-past-wordcamps.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012templateschedulephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/template-schedule.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012archivephp"></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/themes/wordcamp-central-2012/archive.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/themes/wordcamp-central-2012/archive.php  2016-09-12 19:10:03 UTC (rev 4037)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/archive.php    2016-09-12 19:10:09 UTC (rev 4038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,48 +1,48 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Archives template
- */
-?>
-<?php get_header(); ?>
-
-       <div id="container" class="group">
-               <div id="content" role="main" class="group">
-                       <?php if ( have_posts() ) the_post(); ?>
-
-                       <h1 class="page-title">
-                               <?php if ( is_day() ) : ?>
-                                       <?php printf( __( 'Daily Archives: <span>%s</span>', 'twentyten' ), get_the_date() ); ?>
-                               <?php elseif ( is_month() ) : ?>
-                                               <?php printf( __( 'Monthly Archives: <span>%s</span>', 'twentyten' ), get_the_date( _x( 'F Y', 'monthly archives date format', 'twentyten' ) ) ); ?>
-                               <?php elseif ( is_year() ) : ?>
-                                               <?php printf( __( 'Yearly Archives: <span>%s</span>', 'twentyten' ), get_the_date( _x( 'Y', 'yearly archives date format', 'twentyten' ) ) ); ?>
-                               <?php else : ?>
-                                               <?php _e( 'Blog Archives', 'twentyten' ); ?>
-                               <?php endif; ?>
-                       </h1>
-               
-                       <?php rewind_posts(); // due to the_post() above ?>
-                                                       
-                       <?php get_search_form(); ?>
-
-                       <?php get_template_part( 'navigation-above' ); ?>
-
-                       <?php while ( have_posts() ) : the_post(); ?>
-
-                                       <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-
-                                               <?php get_template_part( 'content', get_post_format() ); ?>
-
-                                       </div><!-- #post-## -->
-
-                       <?php endwhile; // End the loop. Whew. ?>
-
-                       <?php get_template_part( 'navigation-below' ); ?>
-
-               </div><!-- #content -->
-
-       </div><!-- #container -->
-
-       <?php get_sidebar(); ?>
-
-<?php get_footer(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Archives template
+ */
+?>
+<?php get_header(); ?>
+
+       <div id="container" class="group">
+               <div id="content" role="main" class="group">
+                       <?php if ( have_posts() ) the_post(); ?>
+
+                       <h1 class="page-title">
+                               <?php if ( is_day() ) : ?>
+                                       <?php printf( __( 'Daily Archives: <span>%s</span>', 'twentyten' ), get_the_date() ); ?>
+                               <?php elseif ( is_month() ) : ?>
+                                               <?php printf( __( 'Monthly Archives: <span>%s</span>', 'twentyten' ), get_the_date( _x( 'F Y', 'monthly archives date format', 'twentyten' ) ) ); ?>
+                               <?php elseif ( is_year() ) : ?>
+                                               <?php printf( __( 'Yearly Archives: <span>%s</span>', 'twentyten' ), get_the_date( _x( 'Y', 'yearly archives date format', 'twentyten' ) ) ); ?>
+                               <?php else : ?>
+                                               <?php _e( 'Blog Archives', 'twentyten' ); ?>
+                               <?php endif; ?>
+                       </h1>
+
+                       <?php rewind_posts(); // due to the_post() above ?>
+
+                       <?php get_search_form(); ?>
+
+                       <?php get_template_part( 'navigation-above' ); ?>
+
+                       <?php while ( have_posts() ) : the_post(); ?>
+
+                                       <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+
+                                               <?php get_template_part( 'content', get_post_format() ); ?>
+
+                                       </div><!-- #post-## -->
+
+                       <?php endwhile; // End the loop. Whew. ?>
+
+                       <?php get_template_part( 'navigation-below' ); ?>
+
+               </div><!-- #content -->
+
+       </div><!-- #container -->
+
+       <?php get_sidebar(); ?>
+
+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012authorphp"></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/themes/wordcamp-central-2012/author.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/themes/wordcamp-central-2012/author.php   2016-09-12 19:10:03 UTC (rev 4037)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/author.php     2016-09-12 19:10:09 UTC (rev 4038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,53 +1,53 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Author archives template
- */
-?>
-<?php get_header(); ?>
-
-       <div id="container" class="group">
-               <div id="content" role="main" class="group">
-                       <?php if ( have_posts() ) the_post(); ?>
-
-                       <h1 class="page-title author"><?php printf( __( 'Author Archives: %s', 'twentyten' ), "<span class='vcard'><a class='url fn n' href='" . get_author_posts_url( get_the_author_meta( 'ID' ) ) . "' title='" . esc_attr( get_the_author() ) . "' rel='me'>" . get_the_author() . "</a></span>" ); ?></h1>
-
-                       <?php
-                       // If a user has filled out their description, show a bio on their entries.
-                       if ( get_the_author_meta( 'description' ) ) : ?>
-                               <div id="entry-author-info">
-                                       <div id="author-avatar">
-                                               <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyten_author_bio_avatar_size', 60 ) ); ?>
-                                       </div><!-- #author-avatar -->
-                                       <div id="author-description">
-                                               <h2><?php printf( __( 'About %s', 'twentyten' ), get_the_author() ); ?></h2>
-                                               <?php the_author_meta( 'description' ); ?>
-                                       </div><!-- #author-description -->
-                               </div><!-- #entry-author-info -->
-                       <?php endif; ?>
-
-               
-                       <?php rewind_posts(); // due to the_post() above ?>
-                                                       
-                       <?php get_search_form(); ?>
-
-                       <?php get_template_part( 'navigation-above' ); ?>
-
-                       <?php while ( have_posts() ) : the_post(); ?>
-
-                                       <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-
-                                               <?php get_template_part( 'content', get_post_format() ); ?>
-
-                                       </div><!-- #post-## -->
-
-                       <?php endwhile; // End the loop. Whew. ?>
-
-                       <?php get_template_part( 'navigation-below' ); ?>
-
-               </div><!-- #content -->
-
-       </div><!-- #container -->
-
-       <?php get_sidebar(); ?>
-
-<?php get_footer(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Author archives template
+ */
+?>
+<?php get_header(); ?>
+
+       <div id="container" class="group">
+               <div id="content" role="main" class="group">
+                       <?php if ( have_posts() ) the_post(); ?>
+
+                       <h1 class="page-title author"><?php printf( __( 'Author Archives: %s', 'twentyten' ), "<span class='vcard'><a class='url fn n' href='" . get_author_posts_url( get_the_author_meta( 'ID' ) ) . "' title='" . esc_attr( get_the_author() ) . "' rel='me'>" . get_the_author() . "</a></span>" ); ?></h1>
+
+                       <?php
+                       // If a user has filled out their description, show a bio on their entries.
+                       if ( get_the_author_meta( 'description' ) ) : ?>
+                               <div id="entry-author-info">
+                                       <div id="author-avatar">
+                                               <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyten_author_bio_avatar_size', 60 ) ); ?>
+                                       </div><!-- #author-avatar -->
+                                       <div id="author-description">
+                                               <h2><?php printf( __( 'About %s', 'twentyten' ), get_the_author() ); ?></h2>
+                                               <?php the_author_meta( 'description' ); ?>
+                                       </div><!-- #author-description -->
+                               </div><!-- #entry-author-info -->
+                       <?php endif; ?>
+
+
+                       <?php rewind_posts(); // due to the_post() above ?>
+
+                       <?php get_search_form(); ?>
+
+                       <?php get_template_part( 'navigation-above' ); ?>
+
+                       <?php while ( have_posts() ) : the_post(); ?>
+
+                                       <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+
+                                               <?php get_template_part( 'content', get_post_format() ); ?>
+
+                                       </div><!-- #post-## -->
+
+                       <?php endwhile; // End the loop. Whew. ?>
+
+                       <?php get_template_part( 'navigation-below' ); ?>
+
+               </div><!-- #content -->
+
+       </div><!-- #container -->
+
+       <?php get_sidebar(); ?>
+
+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012categoryphp"></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/themes/wordcamp-central-2012/category.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/themes/wordcamp-central-2012/category.php 2016-09-12 19:10:03 UTC (rev 4037)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/category.php   2016-09-12 19:10:09 UTC (rev 4038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,42 +1,42 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Category archives template
- */
-?>
-<?php get_header(); ?>
-
-       <div id="container" class="group">
-               <div id="content" role="main" class="group">
-
-                       <h1 class="page-title"><?php
-                               printf( __( 'Category Archives: %s', 'twentyten' ), '<span>' . single_cat_title( '', false ) . '</span>' );
-                       ?></h1>
-                       <?php
-                               $category_description = category_description();
-                               if ( ! empty( $category_description ) )
-                                       echo '<div class="archive-meta">' . $category_description . '</div>';
-                       ?>
-                                       
-                       <?php get_search_form(); ?>
-
-                       <?php get_template_part( 'navigation-above' ); ?>
-
-                       <?php while ( have_posts() ) : the_post(); ?>
-
-                                       <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-
-                                               <?php get_template_part( 'content', get_post_format() ); ?>
-
-                                       </div><!-- #post-## -->
-
-                       <?php endwhile; // End the loop. Whew. ?>
-
-                       <?php get_template_part( 'navigation-below' ); ?>
-
-               </div><!-- #content -->
-
-       </div><!-- #container -->
-
-       <?php get_sidebar(); ?>
-
-<?php get_footer(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Category archives template
+ */
+?>
+<?php get_header(); ?>
+
+       <div id="container" class="group">
+               <div id="content" role="main" class="group">
+
+                       <h1 class="page-title"><?php
+                               printf( __( 'Category Archives: %s', 'twentyten' ), '<span>' . single_cat_title( '', false ) . '</span>' );
+                       ?></h1>
+                       <?php
+                               $category_description = category_description();
+                               if ( ! empty( $category_description ) )
+                                       echo '<div class="archive-meta">' . $category_description . '</div>';
+                       ?>
+
+                       <?php get_search_form(); ?>
+
+                       <?php get_template_part( 'navigation-above' ); ?>
+
+                       <?php while ( have_posts() ) : the_post(); ?>
+
+                                       <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+
+                                               <?php get_template_part( 'content', get_post_format() ); ?>
+
+                                       </div><!-- #post-## -->
+
+                       <?php endwhile; // End the loop. Whew. ?>
+
+                       <?php get_template_part( 'navigation-below' ); ?>
+
+               </div><!-- #content -->
+
+       </div><!-- #container -->
+
+       <?php get_sidebar(); ?>
+
+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012contentphp"></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/themes/wordcamp-central-2012/content.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/themes/wordcamp-central-2012/content.php  2016-09-12 19:10:03 UTC (rev 4037)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/content.php    2016-09-12 19:10:09 UTC (rev 4038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,4 +45,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">                        <?php comments_popup_link('No replies yet', '1 reply', '% replies', 'comments-link', 'Comments are off for this post' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                        <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                </div><!-- .entry-utility -->
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                </div><!-- .entry-utility -->
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012editorstylecss"></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/themes/wordcamp-central-2012/editor-style.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/themes/wordcamp-central-2012/editor-style.css     2016-09-12 19:10:03 UTC (rev 4037)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/editor-style.css       2016-09-12 19:10:09 UTC (rev 4038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,30 +1,30 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-html .mceContentBody {
-       max-width: 640px;
-}
-* {
-       color: #424242;
-       font-family: "Helvetica", "Arial", sans-serif;
-       font-weight: 300;
-       font-size: 15px;
-       outline: none;
-       line-height: 1.5;
-}
-
-p, dl, td, th, ul, ol, blockquote {
-       font-size: 15px;
-}
-
-a, a:link, a:visited {
-       color: #028DB9;
-       font-weight: 600;
-       text-decoration: none;
-       outline: none;
-}
-
-h3 {
-       font-size: 14px;
-       font-weight: 600;
-       text-transform: uppercase;
-       font-family: "Georgia", serif;
-       color: #6F6F6F;
-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+html .mceContentBody {
+       max-width: 640px;
+}
+* {
+       color: #424242;
+       font-family: "Helvetica", "Arial", sans-serif;
+       font-weight: 300;
+       font-size: 15px;
+       outline: none;
+       line-height: 1.5;
+}
+
+p, dl, td, th, ul, ol, blockquote {
+       font-size: 15px;
+}
+
+a, a:link, a:visited {
+       color: #028DB9;
+       font-weight: 600;
+       text-decoration: none;
+       outline: none;
+}
+
+h3 {
+       font-size: 14px;
+       font-weight: 600;
+       text-transform: uppercase;
+       font-family: "Georgia", serif;
+       color: #6F6F6F;
+}
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012footerphp"></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/themes/wordcamp-central-2012/footer.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/themes/wordcamp-central-2012/footer.php   2016-09-12 19:10:03 UTC (rev 4037)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/footer.php     2016-09-12 19:10:09 UTC (rev 4038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,38 +1,38 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Footer template
- */
-?>
-       </div><!-- #main -->
-
-       <div id="footer" class="group" role="contentinfo">
-               <div id="colophon">
-
-<?php
-       /* A sidebar in the footer? Yep. You can can customize
-        * your footer with four columns of widgets.
-        */
-       get_sidebar( 'footer' );
-?>
-
-                       <a href="http://wordpress.org" title="Code is Poetry | WordPress.org" class="wc-code-is-poetry">
-                               Code is Poetry
-                       </a>
-
-                       <?php wp_nav_menu( array( 'container_class' => 'menu-footer', 'theme_location' => 'primary', 'depth' => 1 ) ); ?>
-                       
-               </div><!-- #colophon -->
-       </div><!-- #footer -->
-
-</div><!-- #wrapper -->
-
-<?php
-       /* Always have wp_footer() just before the closing </body>
-        * tag of your theme, or you will break many plugins, which
-        * generally use this hook to reference JavaScript files.
-        */
-
-       wp_footer();
-?>
-</body>
-</html>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Footer template
+ */
+?>
+       </div><!-- #main -->
+
+       <div id="footer" class="group" role="contentinfo">
+               <div id="colophon">
+
+<?php
+       /* A sidebar in the footer? Yep. You can can customize
+        * your footer with four columns of widgets.
+        */
+       get_sidebar( 'footer' );
+?>
+
+                       <a href="http://wordpress.org" title="Code is Poetry | WordPress.org" class="wc-code-is-poetry">
+                               Code is Poetry
+                       </a>
+
+                       <?php wp_nav_menu( array( 'container_class' => 'menu-footer', 'theme_location' => 'primary', 'depth' => 1 ) ); ?>
+
+               </div><!-- #colophon -->
+       </div><!-- #footer -->
+
+</div><!-- #wrapper -->
+
+<?php
+       /* Always have wp_footer() just before the closing </body>
+        * tag of your theme, or you will break many plugins, which
+        * generally use this hook to reference JavaScript files.
+        */
+
+       wp_footer();
+?>
+</body>
+</html>
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012headerphp"></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/themes/wordcamp-central-2012/header.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/themes/wordcamp-central-2012/header.php   2016-09-12 19:10:03 UTC (rev 4037)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/header.php     2016-09-12 19:10:09 UTC (rev 4038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,15 +86,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">                <div class="wc-hero-intro">
</span><span class="cx" style="display: block; padding: 0 10px">                        <h2>WordCamp is a conference that focuses on everything WordPress.</h2>
</span><span class="cx" style="display: block; padding: 0 10px">                        <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                WordCamps are informal, community-organized events that are put together by WordPress users like you. 
-                               Everyone from casual users to core developers participate, share ideas, and get to know each other. 
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         WordCamps are informal, community-organized events that are put together by WordPress users like you.
+                               Everyone from casual users to core developers participate, share ideas, and get to know each other.
</ins><span class="cx" style="display: block; padding: 0 10px">                         </p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <p class="wc-hero-actions">             
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <p class="wc-hero-actions">
</ins><span class="cx" style="display: block; padding: 0 10px">                                 <a href="<?php echo home_url( '/about/' ); ?>" class="wc-hero-learnmore">Learn More</a> or
</span><span class="cx" style="display: block; padding: 0 10px">                                <a href="<?php echo home_url( '/schedule/' ); ?>" class="wc-primary-button">Find a WordCamp</a>
</span><span class="cx" style="display: block; padding: 0 10px">                        </p>
</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- .wc-hero-intro -->
</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">                 <div class="wc-hero-image cycle-me">
</span><span class="cx" style="display: block; padding: 0 10px">                        <?php
</span><span class="cx" style="display: block; padding: 0 10px">                                // Get image attachments from page Home.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,10 +107,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        'order' => 'DESC',
</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">-                        
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px">                         <?php foreach ( $attachments as $image ) : ?>
</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">                                         $image_src = wp_get_attachment_image_src( $image->ID, 'wccentral-thumbnail-hero' );
</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( ! $image_src ) continue;
</span><span class="cx" style="display: block; padding: 0 10px">                                        list( $src, $width, $height ) = $image_src;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,15 +121,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        <span class="wc-hero-caption"><?php echo esc_html( $image->post_excerpt ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                </div>
</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">                         <?php endforeach; ?>
</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">                 </div><!-- .wc-hero-image -->
</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">                 <div class="wc-hero-mailinglist">
</span><span class="cx" style="display: block; padding: 0 10px">                        <?php if ( WordCamp_Central_Theme::can_subscribe() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="wc-hero-mailinglist-container">
</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">                                 <?php if ( WordCamp_Central_Theme::get_subscription_status() == 'success' ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p class="wc-hero-mailinglist-subscription-status">Thanks for subscribing! <br /> Please check your inbox to confirm your subscription.</p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,11 +147,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        <input type="submit" class="wc-hero-mailinglist-submit" value="Go" />
</span><span class="cx" style="display: block; padding: 0 10px">                                        </form>
</span><span class="cx" style="display: block; padding: 0 10px">                                <?php endif; // get_subscription_status ?>
</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">                         </div>
</span><span class="cx" style="display: block; padding: 0 10px">                        <?php endif; // can_subscribe ?>
</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- #wc-hero-mailinglist -->
</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">         </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #wc-hero-panel -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // is_front_page ?>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012indexphp"></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/themes/wordcamp-central-2012/index.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/themes/wordcamp-central-2012/index.php    2016-09-12 19:10:03 UTC (rev 4037)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/index.php      2016-09-12 19:10:09 UTC (rev 4038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,21 +11,21 @@
</span><span class="cx" style="display: block; padding: 0 10px">        <?php get_search_form(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        <?php get_template_part( 'navigation-above' ); ?>
</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">         <?php while ( have_posts() ) : the_post(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</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">                                 <?php get_template_part( 'content', get_post_format() ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        </div><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        <?php endwhile; // End the loop. Whew. ?>
</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">         <?php get_template_part( 'navigation-below' ); ?>
</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">         </div><!-- #content -->
</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"> </div><!-- #container -->
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> <?php get_sidebar('blog'); ?>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012loopattachmentphp"></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/themes/wordcamp-central-2012/loop-attachment.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/themes/wordcamp-central-2012/loop-attachment.php  2016-09-12 19:10:03 UTC (rev 4037)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/loop-attachment.php    2016-09-12 19:10:09 UTC (rev 4038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,108 +1,108 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * The loop that displays an attachment.
- *
- * The loop displays the posts and the post content.  See
- * http://codex.wordpress.org/The_Loop to understand it and
- * http://codex.wordpress.org/Template_Tags to understand
- * the tags used in it.
- *
- * This can be overridden in child themes with loop-attachment.php.
- *
- * @package WordPress
- * @subpackage Twenty_Ten
- * @since Twenty Ten 1.2
- */
-?>
-
-<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
-
-                               <?php if ( ! empty( $post->post_parent ) ) : ?>
-                                       <p class="page-title"><a href="<?php echo get_permalink( $post->post_parent ); ?>" title="<?php echo esc_attr( sprintf( __( 'Return to %s', 'twentyten' ), strip_tags( get_the_title( $post->post_parent ) ) ) ); ?>" rel="gallery"><?php
-                                               /* translators: %s - title of parent post */
-                                               printf( __( '&larr; %s', 'twentyten' ), get_the_title( $post->post_parent ) );
-                                       ?></a></p>
-                               <?php endif; ?>
-                               
-                               <div class="entry-meta">
-                                       <ul>      
-                                               <li class="wc-single-avatar"><?php echo get_avatar( get_the_author_meta('ID'), 140 ); ?></li>
-                                               <li class="wc-single-author"><strong>Posted by</strong> <?php the_author_posts_link(); ?></li>
-                                               <li class="wc-single-date"><strong>Posted on</strong> <?php the_date(); ?></li>                                         
-                                               <li><?php comments_popup_link('No replies yet', '1 reply', '% replies', 'comments-link', 'Comments are off for this post' ); ?></li>
-                                               <li>
-                                               <?php
-                                               if ( wp_attachment_is_image() ) {
-                                                       $metadata = wp_get_attachment_metadata();
-                                                       printf( __( 'Full size is %s pixels', 'twentyten' ),
-                                                               sprintf( '<a href="%1$s" title="%2$s">%3$s &times; %4$s</a>',
-                                                                       wp_get_attachment_url(),
-                                                                       esc_attr( __( 'Link to full-size image', 'twentyten' ) ),
-                                                                       $metadata['width'],
-                                                                       $metadata['height']
-                                                               )
-                                                       );
-                                               }
-                                       ?>
-                                               </li>
-                                               <li class="wc-single-search"><strong>Search</strong> <?php get_search_form(); ?></li>   
-                                               
-                                       </ul>                                     
-                               </div><!-- .entry-meta -->
-
-                               <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-                                       <h2 class="entry-title"><?php the_title(); ?></h2>
-
-                                       <div class="entry-content">
-                                               <div class="entry-attachment">
-
-                                                       <?php if ( wp_attachment_is_image() ) :
-                                                               $attachments = array_values( get_children( array( 'post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) );
-                                                               foreach ( $attachments as $k => $attachment ) {
-                                                                       if ( $attachment->ID == $post->ID )
-                                                                               break;
-                                                               }
-                                                               $k++;
-                                                               // If there is more than 1 image attachment in a gallery
-                                                               if ( count( $attachments ) > 1 ) {
-                                                                       if ( isset( $attachments[ $k ] ) )
-                                                                               // get the URL of the next image attachment
-                                                                               $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
-                                                                       else
-                                                                               // or get the URL of the first image attachment
-                                                                               $next_attachment_url = get_attachment_link( $attachments[ 0 ]->ID );
-                                                               } else {
-                                                                       // or, if there's only 1 image attachment, get the URL of the image
-                                                                       $next_attachment_url = wp_get_attachment_url();
-                                                               }
-                                                       ?>
-                                                       <p class="attachment"><a href="<?php echo $next_attachment_url; ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php
-                                                               $attachment_width  = apply_filters( 'twentyten_attachment_size', 900 );
-                                                               $attachment_height = apply_filters( 'twentyten_attachment_height', 900 );
-                                                               echo wp_get_attachment_image( $post->ID, array( $attachment_width, $attachment_height ) ); // filterable image width with, essentially, no limit for image height.
-                                                       ?></a></p>
-       
-                                                       <div id="nav-below" class="navigation">
-                                                               <div class="nav-previous"><?php previous_image_link( false ); ?></div>
-                                                               <div class="nav-next"><?php next_image_link( false ); ?></div>
-                                                       </div><!-- #nav-below -->
-       <?php else : ?>
-                                                       <a href="<?php echo wp_get_attachment_url(); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php echo basename( get_permalink() ); ?></a>
-<?php endif; ?>
-                                               </div><!-- .entry-attachment -->
-                                               <div class="entry-caption"><?php if ( !empty( $post->post_excerpt ) ) the_excerpt(); ?></div>
-
-<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
-<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
-
-                                       </div><!-- .entry-content -->
-
-                                       <div class="entry-utility">
-                                               <?php twentyten_posted_in(); ?>
-                                               <?php edit_post_link( __( 'Edit', 'twentyten' ), ' <span class="edit-link">', '</span>' ); ?>
-                                       </div><!-- .entry-utility -->
-                               </div><!-- #post-## -->
-
-<?php comments_template(); ?>
-
-<?php endwhile; // end of the loop. ?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * The loop that displays an attachment.
+ *
+ * The loop displays the posts and the post content.  See
+ * http://codex.wordpress.org/The_Loop to understand it and
+ * http://codex.wordpress.org/Template_Tags to understand
+ * the tags used in it.
+ *
+ * This can be overridden in child themes with loop-attachment.php.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Ten
+ * @since Twenty Ten 1.2
+ */
+?>
+
+<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
+
+                               <?php if ( ! empty( $post->post_parent ) ) : ?>
+                                       <p class="page-title"><a href="<?php echo get_permalink( $post->post_parent ); ?>" title="<?php echo esc_attr( sprintf( __( 'Return to %s', 'twentyten' ), strip_tags( get_the_title( $post->post_parent ) ) ) ); ?>" rel="gallery"><?php
+                                               /* translators: %s - title of parent post */
+                                               printf( __( '&larr; %s', 'twentyten' ), get_the_title( $post->post_parent ) );
+                                       ?></a></p>
+                               <?php endif; ?>
+
+                               <div class="entry-meta">
+                                       <ul>
+                                               <li class="wc-single-avatar"><?php echo get_avatar( get_the_author_meta('ID'), 140 ); ?></li>
+                                               <li class="wc-single-author"><strong>Posted by</strong> <?php the_author_posts_link(); ?></li>
+                                               <li class="wc-single-date"><strong>Posted on</strong> <?php the_date(); ?></li>
+                                               <li><?php comments_popup_link('No replies yet', '1 reply', '% replies', 'comments-link', 'Comments are off for this post' ); ?></li>
+                                               <li>
+                                               <?php
+                                               if ( wp_attachment_is_image() ) {
+                                                       $metadata = wp_get_attachment_metadata();
+                                                       printf( __( 'Full size is %s pixels', 'twentyten' ),
+                                                               sprintf( '<a href="%1$s" title="%2$s">%3$s &times; %4$s</a>',
+                                                                       wp_get_attachment_url(),
+                                                                       esc_attr( __( 'Link to full-size image', 'twentyten' ) ),
+                                                                       $metadata['width'],
+                                                                       $metadata['height']
+                                                               )
+                                                       );
+                                               }
+                                       ?>
+                                               </li>
+                                               <li class="wc-single-search"><strong>Search</strong> <?php get_search_form(); ?></li>
+
+                                       </ul>
+                               </div><!-- .entry-meta -->
+
+                               <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+                                       <h2 class="entry-title"><?php the_title(); ?></h2>
+
+                                       <div class="entry-content">
+                                               <div class="entry-attachment">
+
+                                                       <?php if ( wp_attachment_is_image() ) :
+                                                               $attachments = array_values( get_children( array( 'post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) );
+                                                               foreach ( $attachments as $k => $attachment ) {
+                                                                       if ( $attachment->ID == $post->ID )
+                                                                               break;
+                                                               }
+                                                               $k++;
+                                                               // If there is more than 1 image attachment in a gallery
+                                                               if ( count( $attachments ) > 1 ) {
+                                                                       if ( isset( $attachments[ $k ] ) )
+                                                                               // get the URL of the next image attachment
+                                                                               $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
+                                                                       else
+                                                                               // or get the URL of the first image attachment
+                                                                               $next_attachment_url = get_attachment_link( $attachments[ 0 ]->ID );
+                                                               } else {
+                                                                       // or, if there's only 1 image attachment, get the URL of the image
+                                                                       $next_attachment_url = wp_get_attachment_url();
+                                                               }
+                                                       ?>
+                                                       <p class="attachment"><a href="<?php echo $next_attachment_url; ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php
+                                                               $attachment_width  = apply_filters( 'twentyten_attachment_size', 900 );
+                                                               $attachment_height = apply_filters( 'twentyten_attachment_height', 900 );
+                                                               echo wp_get_attachment_image( $post->ID, array( $attachment_width, $attachment_height ) ); // filterable image width with, essentially, no limit for image height.
+                                                       ?></a></p>
+
+                                                       <div id="nav-below" class="navigation">
+                                                               <div class="nav-previous"><?php previous_image_link( false ); ?></div>
+                                                               <div class="nav-next"><?php next_image_link( false ); ?></div>
+                                                       </div><!-- #nav-below -->
+       <?php else : ?>
+                                                       <a href="<?php echo wp_get_attachment_url(); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php echo basename( get_permalink() ); ?></a>
+<?php endif; ?>
+                                               </div><!-- .entry-attachment -->
+                                               <div class="entry-caption"><?php if ( !empty( $post->post_excerpt ) ) the_excerpt(); ?></div>
+
+<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+
+                                       </div><!-- .entry-content -->
+
+                                       <div class="entry-utility">
+                                               <?php twentyten_posted_in(); ?>
+                                               <?php edit_post_link( __( 'Edit', 'twentyten' ), ' <span class="edit-link">', '</span>' ); ?>
+                                       </div><!-- .entry-utility -->
+                               </div><!-- #post-## -->
+
+<?php comments_template(); ?>
+
+<?php endwhile; // end of the loop. ?>
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012navigationabovephp"></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/themes/wordcamp-central-2012/navigation-above.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/themes/wordcamp-central-2012/navigation-above.php 2016-09-12 19:10:03 UTC (rev 4037)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/navigation-above.php   2016-09-12 19:10:09 UTC (rev 4038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,4 +9,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">                <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav arrow">&larr;</span> Older posts', 'twentyten' ) ); ?></div>
</span><span class="cx" style="display: block; padding: 0 10px">                <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav arrow">&rarr;</span>', 'twentyten' ) ); ?></div>
</span><span class="cx" style="display: block; padding: 0 10px">        </div><!-- #nav-above -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endif; ?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php endif; ?>
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012navigationbelowphp"></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/themes/wordcamp-central-2012/navigation-below.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/themes/wordcamp-central-2012/navigation-below.php 2016-09-12 19:10:03 UTC (rev 4037)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/navigation-below.php   2016-09-12 19:10:09 UTC (rev 4038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,4 +9,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav arrow">&larr;</span> Older posts', 'twentyten' ) ); ?></div>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav arrow">&rarr;</span>', 'twentyten' ) ); ?></div>
</span><span class="cx" style="display: block; padding: 0 10px">                                </div><!-- #nav-below -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endif; ?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php endif; ?>
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012pagephp"></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/themes/wordcamp-central-2012/page.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/themes/wordcamp-central-2012/page.php     2016-09-12 19:10:03 UTC (rev 4037)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/page.php       2016-09-12 19:10:09 UTC (rev 4038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,29 +1,29 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Template for displaying pages.
- */
-get_header(); ?>
-
-       <div id="container">
-               <div id="content" role="main">
-
-                       <?php if ( have_posts() ) : ?>
-                               <?php while ( have_posts() ) : the_post(); ?>
-
-                                                       <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-                                                               <h1 class="entry-title"><?php the_title(); ?></h1>
-                                                               <div class="entry-content">
-                                                                       <?php the_content(); ?>
-                                                                       <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
-                                                               </div><!-- .entry-content -->
-                                                       </div><!-- #post-## -->
-
-                               <?php endwhile; // have_posts ?>
-                       <?php endif; ?>
-                       
-               </div><!-- #content -->
-       </div><!-- #container -->
-
-       <?php get_sidebar( 'page' ); ?>
-
-<?php get_footer(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Template for displaying pages.
+ */
+get_header(); ?>
+
+       <div id="container">
+               <div id="content" role="main">
+
+                       <?php if ( have_posts() ) : ?>
+                               <?php while ( have_posts() ) : the_post(); ?>
+
+                                                       <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+                                                               <h1 class="entry-title"><?php the_title(); ?></h1>
+                                                               <div class="entry-content">
+                                                                       <?php the_content(); ?>
+                                                                       <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+                                                               </div><!-- .entry-content -->
+                                                       </div><!-- #post-## -->
+
+                               <?php endwhile; // have_posts ?>
+                       <?php endif; ?>
+
+               </div><!-- #content -->
+       </div><!-- #container -->
+
+       <?php get_sidebar( 'page' ); ?>
+
+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012searchphp"></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/themes/wordcamp-central-2012/search.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/themes/wordcamp-central-2012/search.php   2016-09-12 19:10:03 UTC (rev 4037)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/search.php     2016-09-12 19:10:09 UTC (rev 4038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,48 +1,48 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Search results template
- */
-?>
-<?php get_header(); ?>
-
-       <div id="container" class="group">
-               <div id="content" role="main" class="group">
-                       <h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'twentyten' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
-                                               
-                       <?php get_search_form(); ?>
-                       
-                       <?php if ( have_posts() ) : ?>
-                               
-                               <?php get_template_part( 'navigation-above' ); ?>
-
-                               <?php while ( have_posts() ) : the_post(); ?>
-
-                                               <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-
-                                                       <?php get_template_part( 'content', get_post_format() ); ?>
-
-                                               </div><!-- #post-## -->
-
-                               <?php endwhile; // End the loop. Whew. ?>
-
-                               <?php get_template_part( 'navigation-below' ); ?>
-                               
-                       <?php else : // have_posts ?>
-                               
-                               <div id="post-0" class="post no-results not-found">
-                                       <h2 class="entry-title"><?php _e( 'We couldn&#8217;t find anything!', 'twentyten' ); ?></h2>
-                                       <div class="entry-content">
-                                               <p><?php _e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'twentyten' ); ?></p>
-                                               <p><?php get_search_form(); ?></p>
-                                       </div><!-- .entry-content -->
-                               </div><!-- #post-0 -->
-                               
-                       <?php endif; ?>
-
-               </div><!-- #content -->
-
-       </div><!-- #container -->
-
-       <?php get_sidebar(); ?>
-
-<?php get_footer(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Search results template
+ */
+?>
+<?php get_header(); ?>
+
+       <div id="container" class="group">
+               <div id="content" role="main" class="group">
+                       <h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'twentyten' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
+
+                       <?php get_search_form(); ?>
+
+                       <?php if ( have_posts() ) : ?>
+
+                               <?php get_template_part( 'navigation-above' ); ?>
+
+                               <?php while ( have_posts() ) : the_post(); ?>
+
+                                               <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+
+                                                       <?php get_template_part( 'content', get_post_format() ); ?>
+
+                                               </div><!-- #post-## -->
+
+                               <?php endwhile; // End the loop. Whew. ?>
+
+                               <?php get_template_part( 'navigation-below' ); ?>
+
+                       <?php else : // have_posts ?>
+
+                               <div id="post-0" class="post no-results not-found">
+                                       <h2 class="entry-title"><?php _e( 'We couldn&#8217;t find anything!', 'twentyten' ); ?></h2>
+                                       <div class="entry-content">
+                                               <p><?php _e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'twentyten' ); ?></p>
+                                               <p><?php get_search_form(); ?></p>
+                                       </div><!-- .entry-content -->
+                               </div><!-- #post-0 -->
+
+                       <?php endif; ?>
+
+               </div><!-- #content -->
+
+       </div><!-- #container -->
+
+       <?php get_sidebar(); ?>
+
+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012sidebarblogphp"></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/themes/wordcamp-central-2012/sidebar-blog.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/themes/wordcamp-central-2012/sidebar-blog.php     2016-09-12 19:10:03 UTC (rev 4037)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/sidebar-blog.php       2016-09-12 19:10:09 UTC (rev 4038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,4 +2,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        <ul class="xoxo">
</span><span class="cx" style="display: block; padding: 0 10px">                                <?php dynamic_sidebar( 'blog-widget-area' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                        </ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                </div><!-- #primary .widget-area -->
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                </div><!-- #primary .widget-area -->
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012sidebarfooterphp"></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/themes/wordcamp-central-2012/sidebar-footer.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/themes/wordcamp-central-2012/sidebar-footer.php   2016-09-12 19:10:03 UTC (rev 4037)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/sidebar-footer.php     2016-09-12 19:10:09 UTC (rev 4038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,56 +1,56 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Footer sidebar template.
- */
-?>
-
-<?php
-       /* The footer widget area is triggered if any of the areas
-        * have widgets. So let's check that first.
-        *
-        * If none of the sidebars have widgets, then let's bail early.
-        */
-       if (   ! is_active_sidebar( 'first-footer-widget-area'  )
-               && ! is_active_sidebar( 'second-footer-widget-area' )
-               && ! is_active_sidebar( 'third-footer-widget-area'  )
-               // && ! is_active_sidebar( 'fourth-footer-widget-area' )
-       )
-               return;
-       // If we get this far, we have widgets. Let do this.
-?>
-
-                       <div id="footer-widget-area" role="complementary">
-
-<?php if ( is_active_sidebar( 'first-footer-widget-area' ) ) : ?>
-                               <div id="first" class="widget-area">
-                                       <ul class="xoxo">
-                                               <?php dynamic_sidebar( 'first-footer-widget-area' ); ?>
-                                       </ul>
-                               </div><!-- #first .widget-area -->
-<?php endif; ?>
-
-<?php if ( is_active_sidebar( 'second-footer-widget-area' ) ) : ?>
-                               <div id="second" class="widget-area">
-                                       <ul class="xoxo">
-                                               <?php dynamic_sidebar( 'second-footer-widget-area' ); ?>
-                                       </ul>
-                               </div><!-- #second .widget-area -->
-<?php endif; ?>
-
-<?php if ( is_active_sidebar( 'third-footer-widget-area' ) ) : ?>
-                               <div id="third" class="widget-area">
-                                       <ul class="xoxo">
-                                               <?php dynamic_sidebar( 'third-footer-widget-area' ); ?>
-                                       </ul>
-                               </div><!-- #third .widget-area -->
-<?php endif; ?>
-
-<?php /* if ( is_active_sidebar( 'fourth-footer-widget-area' ) ) : ?>
-                               <div id="fourth" class="widget-area">
-                                       <ul class="xoxo">
-                                               <?php dynamic_sidebar( 'fourth-footer-widget-area' ); ?>
-                                       </ul>
-                               </div><!-- #fourth .widget-area -->
-<?php endif; */ ?>
-
-                       </div><!-- #footer-widget-area -->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Footer sidebar template.
+ */
+?>
+
+<?php
+       /* The footer widget area is triggered if any of the areas
+        * have widgets. So let's check that first.
+        *
+        * If none of the sidebars have widgets, then let's bail early.
+        */
+       if (   ! is_active_sidebar( 'first-footer-widget-area'  )
+               && ! is_active_sidebar( 'second-footer-widget-area' )
+               && ! is_active_sidebar( 'third-footer-widget-area'  )
+               // && ! is_active_sidebar( 'fourth-footer-widget-area' )
+       )
+               return;
+       // If we get this far, we have widgets. Let do this.
+?>
+
+                       <div id="footer-widget-area" role="complementary">
+
+<?php if ( is_active_sidebar( 'first-footer-widget-area' ) ) : ?>
+                               <div id="first" class="widget-area">
+                                       <ul class="xoxo">
+                                               <?php dynamic_sidebar( 'first-footer-widget-area' ); ?>
+                                       </ul>
+                               </div><!-- #first .widget-area -->
+<?php endif; ?>
+
+<?php if ( is_active_sidebar( 'second-footer-widget-area' ) ) : ?>
+                               <div id="second" class="widget-area">
+                                       <ul class="xoxo">
+                                               <?php dynamic_sidebar( 'second-footer-widget-area' ); ?>
+                                       </ul>
+                               </div><!-- #second .widget-area -->
+<?php endif; ?>
+
+<?php if ( is_active_sidebar( 'third-footer-widget-area' ) ) : ?>
+                               <div id="third" class="widget-area">
+                                       <ul class="xoxo">
+                                               <?php dynamic_sidebar( 'third-footer-widget-area' ); ?>
+                                       </ul>
+                               </div><!-- #third .widget-area -->
+<?php endif; ?>
+
+<?php /* if ( is_active_sidebar( 'fourth-footer-widget-area' ) ) : ?>
+                               <div id="fourth" class="widget-area">
+                                       <ul class="xoxo">
+                                               <?php dynamic_sidebar( 'fourth-footer-widget-area' ); ?>
+                                       </ul>
+                               </div><!-- #fourth .widget-area -->
+<?php endif; */ ?>
+
+                       </div><!-- #footer-widget-area -->
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012sidebarpagephp"></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/themes/wordcamp-central-2012/sidebar-page.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/themes/wordcamp-central-2012/sidebar-page.php     2016-09-12 19:10:03 UTC (rev 4037)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/sidebar-page.php       2016-09-12 19:10:09 UTC (rev 4038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,15 +1,15 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * The Sidebar containing the primary and secondary widget areas.
- *
- * @package WordPress
- * @subpackage Twenty_Ten
- * @since Twenty Ten 1.0
- */
-?>
-
-               <div id="primary" class="widget-area" role="complementary">
-                       <ul class="xoxo">
-                               <?php dynamic_sidebar( 'pages-widget-area' ); ?>
-                       </ul>
-               </div><!-- #primary .widget-area -->
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * The Sidebar containing the primary and secondary widget areas.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Ten
+ * @since Twenty Ten 1.0
+ */
+?>
+
+               <div id="primary" class="widget-area" role="complementary">
+                       <ul class="xoxo">
+                               <?php dynamic_sidebar( 'pages-widget-area' ); ?>
+                       </ul>
+               </div><!-- #primary .widget-area -->
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012singlemesphp"></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/themes/wordcamp-central-2012/single-mes.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/themes/wordcamp-central-2012/single-mes.php       2016-09-12 19:10:03 UTC (rev 4037)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/single-mes.php 2016-09-12 19:10:09 UTC (rev 4038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,35 +1,35 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Single Multi-Event Sponsor post
- */
-
-get_header(); ?>
-
-               <div id="container">
-
-                       <div id="content" role="main">
-
-                               <?php if ( have_posts() ) : ?>
-                                       <?php while ( have_posts() ) : the_post(); ?>
-
-                                               <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-                                                       <h1 class="entry-title"><?php the_title(); ?></h1>
-
-                                                       <div class="entry-content">
-                                                               <?php the_content(); ?>
-                                                               <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
-                                                       </div><!-- .entry-content -->
-
-                                                       <?php if ( has_post_thumbnail() ) : ?>
-                                                               <?php the_post_thumbnail(); ?>
-                                                       <?php endif; ?>
-
-                                               </div><!-- #post-## -->
-
-                                       <?php endwhile; // have_posts ?>
-                               <?php endif; // have_posts ?>
-
-                       </div><!-- #content -->
-               </div><!-- #container -->
-
-<?php get_footer(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Single Multi-Event Sponsor post
+ */
+
+get_header(); ?>
+
+               <div id="container">
+
+                       <div id="content" role="main">
+
+                               <?php if ( have_posts() ) : ?>
+                                       <?php while ( have_posts() ) : the_post(); ?>
+
+                                               <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+                                                       <h1 class="entry-title"><?php the_title(); ?></h1>
+
+                                                       <div class="entry-content">
+                                                               <?php the_content(); ?>
+                                                               <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+                                                       </div><!-- .entry-content -->
+
+                                                       <?php if ( has_post_thumbnail() ) : ?>
+                                                               <?php the_post_thumbnail(); ?>
+                                                       <?php endif; ?>
+
+                                               </div><!-- #post-## -->
+
+                                       <?php endwhile; // have_posts ?>
+                               <?php endif; // have_posts ?>
+
+                       </div><!-- #content -->
+               </div><!-- #container -->
+
+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012singlewordcampphp"></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/themes/wordcamp-central-2012/single-wordcamp.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/themes/wordcamp-central-2012/single-wordcamp.php  2016-09-12 19:10:03 UTC (rev 4037)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/single-wordcamp.php    2016-09-12 19:10:09 UTC (rev 4038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,130 +1,130 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Single WordCamp (post type) template.
- */
-
-if ( get_query_var( 'wcorg-wordcamp-info' ) ) {
-       return get_template_part( 'single-wordcamp-info' );
-}
-
-get_header(); the_post();
-$wordcamp_title = wcpt_get_wordcamp_title();
-?>
-
-               <div id="container">
-                       <div id="content" role="main">
-
-                               <h1 class="entry-title"><?php wcpt_wordcamp_title(); ?></h1>
-
-                               <?php if ( has_post_thumbnail() ) : ?>
-                                       <div class="wc-banner">
-                                       <?php the_post_thumbnail( 'wccentral-thumbnail-large', array( 'class' => 'wc-image' ) ); ?>
-                                       <?php $thumb = get_post( get_post_thumbnail_id() ); ?>
-                                       <?php if ( ! empty( $thumb->post_excerpt ) ) : ?>
-                                               <span class="caption"><?php echo esc_html( $thumb->post_excerpt ); ?></span>
-                                       <?php endif; ?>
-                                       </div><!-- .wc-banner -->
-                               <?php endif; ?>
-
-                               <?php if ( wcpt_get_wordcamp_url() ) : ?>
-                                       <a href="<?php wcpt_wordcamp_url(); ?>" class="wc-single-website">
-                                               <?php $shot_url = add_query_arg( array( 'w' => 205, 'h' => 148 ), 'http://s.wordpress.com/mshots/v1/' . urlencode( wcpt_get_wordcamp_url() ) ); ?>
-                                               <img src="<?php echo esc_url( $shot_url ); ?>" />
-                                               Visit Website &rarr;
-                                       </a>
-                               <?php endif; ?>
-
-                               <div class="wc-single-info">
-
-                                       <?php if ( wcpt_get_wordcamp_start_date( 0, 'F' ) ) : ?>
-                                               <strong class="wc-single-label">Date</strong>
-                                               <?php WordCamp_Central_Theme::the_wordcamp_date(); ?>,
-                                               <?php wcpt_wordcamp_start_date( 0, 'Y' ); ?>
-                                       <?php endif; ?>
-
-                                       <?php if ( wcpt_get_wordcamp_physical_address() || wcpt_get_wordcamp_venue_name() ) : ?>
-                                               <strong class="wc-single-label">Location</strong>
-                                               <?php if ( wcpt_get_wordcamp_physical_address() ) : ?>
-
-                                                       <?php
-                                                               $address = urlencode( implode( " ", explode( "\n", wcpt_get_wordcamp_physical_address() ) ) );
-                                                               $map_url = 'http://maps.googleapis.com/maps/api/staticmap?center=' . $address . '&zoom=14&size=130x70&maptype=roadmap&markers=color:blue%7Clabel:A%7C' . $address . '&sensor=false';
-                                                               $map_link = 'http://maps.google.com/maps?q=' . $address;
-                                                               $venue_link = wcpt_get_wordcamp_venue_url();
-                                                       ?>
-                                                       <a href="<?php echo esc_url( $map_link ); ?>"><img src="<?php echo esc_url( $map_url ); ?>" class="wc-single-map"/></a>
-
-                                                       <?php if ( $venue_link ) : ?>
-                                                               <a href="<?php echo esc_url( $venue_link ); ?>"><?php wcpt_wordcamp_venue_name(); ?></a><br />
-                                                       <?php else : ?>
-                                                               <strong><?php wcpt_wordcamp_venue_name(); ?></strong><br />
-                                                       <?php endif; ?>
-
-                                                       <?php echo nl2br( wcpt_get_wordcamp_physical_address() ); ?><br />
-                                               <?php else: ?>
-                                                       <strong><?php wcpt_wordcamp_venue_name(); ?></strong><br />
-                                                       <?php wcpt_wordcamp_location(); ?>
-                                               <?php endif; // physical_address ?>
-
-                                       <?php else : // no physical address or venue ?>
-                                               <strong class="wc-single-label">Location</strong>
-                                               <?php wcpt_wordcamp_location(); ?>
-                                       <?php endif; // physical_address || venue_name ?>
-
-                                       <?php if ( get_the_content() ) : ?>
-                                               <strong class="wc-single-label">About</strong>
-                                               <?php the_content(); ?><br />
-                                       <?php endif; ?>
-
-                               </div><!-- .wc-single-info -->
-
-                               <?php
-                               // Search for WordCamps with a similar title
-
-                               $wordcamps = get_posts( array(
-                                       'posts_per_page' => 30,
-                                       'post_type' => 'wordcamp',
-                                       'post_status' => WordCamp_Loader::get_public_post_statuses(),
-                                       'orderby' => 'ID',
-                                       's' => $wordcamp_title,
-                               ) );
-
-                               // Since search can look in content too, remove the ones with a different title
-                               foreach ( $wordcamps as $key => $post )
-                                       if ( wcpt_get_wordcamp_title( $post->ID ) != $wordcamp_title )
-                                               unset( $wordcamps[ $key ] );
-
-                               if ( ! empty( $wordcamps ) && function_exists( 'wcpt_has_wordcamps' ) &&
-                                       wcpt_has_wordcamps( array(
-                                               'posts_per_page' => 30,
-                                               'order'          => 'ASC',
-                                               'post_status'    => WordCamp_Loader::get_public_post_statuses(),
-                                               'post__in'       => wp_list_pluck( $wordcamps, 'ID' ),
-                                       ) )
-                               ) :
-                               ?>
-
-                               <div class="wc-single-past">
-
-                                       <h3><?php echo $wordcamp_title; ?></h3>
-                                       <ul>
-
-                                       <?php while ( wcpt_wordcamps() ) : wcpt_the_wordcamp(); ?>
-                                               <li>
-                                                       <a href="<?php wcpt_wordcamp_permalink(); ?>">
-                                                               <strong><?php wcpt_wordcamp_start_date( 0, 'Y' ); ?></strong>
-                                                               <?php WordCamp_Central_Theme::the_wordcamp_date(); ?>
-                                                       </a>
-                                               </li>
-
-                                       <?php endwhile; // wordcamps ?>
-
-                                       </ul>
-
-                               </div> <!-- .wc-single-past -->
-                               <?php endif; // has_wordcamps, function_exists ?>
-
-                       </div><!-- #content -->
-               </div><!-- #container -->
-
-<?php get_footer(); ?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Single WordCamp (post type) template.
+ */
+
+if ( get_query_var( 'wcorg-wordcamp-info' ) ) {
+       return get_template_part( 'single-wordcamp-info' );
+}
+
+get_header(); the_post();
+$wordcamp_title = wcpt_get_wordcamp_title();
+?>
+
+               <div id="container">
+                       <div id="content" role="main">
+
+                               <h1 class="entry-title"><?php wcpt_wordcamp_title(); ?></h1>
+
+                               <?php if ( has_post_thumbnail() ) : ?>
+                                       <div class="wc-banner">
+                                       <?php the_post_thumbnail( 'wccentral-thumbnail-large', array( 'class' => 'wc-image' ) ); ?>
+                                       <?php $thumb = get_post( get_post_thumbnail_id() ); ?>
+                                       <?php if ( ! empty( $thumb->post_excerpt ) ) : ?>
+                                               <span class="caption"><?php echo esc_html( $thumb->post_excerpt ); ?></span>
+                                       <?php endif; ?>
+                                       </div><!-- .wc-banner -->
+                               <?php endif; ?>
+
+                               <?php if ( wcpt_get_wordcamp_url() ) : ?>
+                                       <a href="<?php wcpt_wordcamp_url(); ?>" class="wc-single-website">
+                                               <?php $shot_url = add_query_arg( array( 'w' => 205, 'h' => 148 ), 'http://s.wordpress.com/mshots/v1/' . urlencode( wcpt_get_wordcamp_url() ) ); ?>
+                                               <img src="<?php echo esc_url( $shot_url ); ?>" />
+                                               Visit Website &rarr;
+                                       </a>
+                               <?php endif; ?>
+
+                               <div class="wc-single-info">
+
+                                       <?php if ( wcpt_get_wordcamp_start_date( 0, 'F' ) ) : ?>
+                                               <strong class="wc-single-label">Date</strong>
+                                               <?php WordCamp_Central_Theme::the_wordcamp_date(); ?>,
+                                               <?php wcpt_wordcamp_start_date( 0, 'Y' ); ?>
+                                       <?php endif; ?>
+
+                                       <?php if ( wcpt_get_wordcamp_physical_address() || wcpt_get_wordcamp_venue_name() ) : ?>
+                                               <strong class="wc-single-label">Location</strong>
+                                               <?php if ( wcpt_get_wordcamp_physical_address() ) : ?>
+
+                                                       <?php
+                                                               $address = urlencode( implode( " ", explode( "\n", wcpt_get_wordcamp_physical_address() ) ) );
+                                                               $map_url = 'http://maps.googleapis.com/maps/api/staticmap?center=' . $address . '&zoom=14&size=130x70&maptype=roadmap&markers=color:blue%7Clabel:A%7C' . $address . '&sensor=false';
+                                                               $map_link = 'http://maps.google.com/maps?q=' . $address;
+                                                               $venue_link = wcpt_get_wordcamp_venue_url();
+                                                       ?>
+                                                       <a href="<?php echo esc_url( $map_link ); ?>"><img src="<?php echo esc_url( $map_url ); ?>" class="wc-single-map"/></a>
+
+                                                       <?php if ( $venue_link ) : ?>
+                                                               <a href="<?php echo esc_url( $venue_link ); ?>"><?php wcpt_wordcamp_venue_name(); ?></a><br />
+                                                       <?php else : ?>
+                                                               <strong><?php wcpt_wordcamp_venue_name(); ?></strong><br />
+                                                       <?php endif; ?>
+
+                                                       <?php echo nl2br( wcpt_get_wordcamp_physical_address() ); ?><br />
+                                               <?php else: ?>
+                                                       <strong><?php wcpt_wordcamp_venue_name(); ?></strong><br />
+                                                       <?php wcpt_wordcamp_location(); ?>
+                                               <?php endif; // physical_address ?>
+
+                                       <?php else : // no physical address or venue ?>
+                                               <strong class="wc-single-label">Location</strong>
+                                               <?php wcpt_wordcamp_location(); ?>
+                                       <?php endif; // physical_address || venue_name ?>
+
+                                       <?php if ( get_the_content() ) : ?>
+                                               <strong class="wc-single-label">About</strong>
+                                               <?php the_content(); ?><br />
+                                       <?php endif; ?>
+
+                               </div><!-- .wc-single-info -->
+
+                               <?php
+                               // Search for WordCamps with a similar title
+
+                               $wordcamps = get_posts( array(
+                                       'posts_per_page' => 30,
+                                       'post_type' => 'wordcamp',
+                                       'post_status' => WordCamp_Loader::get_public_post_statuses(),
+                                       'orderby' => 'ID',
+                                       's' => $wordcamp_title,
+                               ) );
+
+                               // Since search can look in content too, remove the ones with a different title
+                               foreach ( $wordcamps as $key => $post )
+                                       if ( wcpt_get_wordcamp_title( $post->ID ) != $wordcamp_title )
+                                               unset( $wordcamps[ $key ] );
+
+                               if ( ! empty( $wordcamps ) && function_exists( 'wcpt_has_wordcamps' ) &&
+                                       wcpt_has_wordcamps( array(
+                                               'posts_per_page' => 30,
+                                               'order'          => 'ASC',
+                                               'post_status'    => WordCamp_Loader::get_public_post_statuses(),
+                                               'post__in'       => wp_list_pluck( $wordcamps, 'ID' ),
+                                       ) )
+                               ) :
+                               ?>
+
+                               <div class="wc-single-past">
+
+                                       <h3><?php echo $wordcamp_title; ?></h3>
+                                       <ul>
+
+                                       <?php while ( wcpt_wordcamps() ) : wcpt_the_wordcamp(); ?>
+                                               <li>
+                                                       <a href="<?php wcpt_wordcamp_permalink(); ?>">
+                                                               <strong><?php wcpt_wordcamp_start_date( 0, 'Y' ); ?></strong>
+                                                               <?php WordCamp_Central_Theme::the_wordcamp_date(); ?>
+                                                       </a>
+                                               </li>
+
+                                       <?php endwhile; // wordcamps ?>
+
+                                       </ul>
+
+                               </div> <!-- .wc-single-past -->
+                               <?php endif; // has_wordcamps, function_exists ?>
+
+                       </div><!-- #content -->
+               </div><!-- #container -->
+
+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012singlephp"></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/themes/wordcamp-central-2012/single.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/themes/wordcamp-central-2012/single.php   2016-09-12 19:10:03 UTC (rev 4037)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/single.php     2016-09-12 19:10:09 UTC (rev 4038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,49 +1,49 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Single post template.
- */
-
-get_header(); ?>
-
-               <div id="container">
-                       <a href="<?php echo home_url( '/news/' ); ?>" class="wc-back-link"><span class="arrow">&larr;</span> Back to WordCamp News</a>
-
-                       <div id="content" role="main">
-
-                               <?php if ( have_posts() ) : ?>
-                                       <?php while ( have_posts() ) : the_post(); ?>
-
-                                                               <div class="entry-meta">
-                                                                       <ul>      
-                                                                               <li class="wc-single-avatar"><?php echo get_avatar( get_the_author_meta('ID'), 140 ); ?></li>
-                                                                               <li class="wc-single-author"><strong>Posted by</strong> <?php the_author_posts_link(); ?></li>
-                                                                               <li class="wc-single-date"><strong>Posted on</strong> <?php the_date(); ?></li>                                         
-                                                                               <li class="wc-single-cats"><strong>Categories</strong> <?php echo get_the_category_list(', '); ?></li>                                                                                  
-                                                                               <?php if ( has_tag() ) : ?>
-                                                                                       <li><strong>Tags</strong> <?php the_tags(' '); ?></li>    
-                                                                               <?php endif; ?>
-                                                                               <li><?php comments_popup_link('No replies yet', '1 reply', '% replies', 'comments-link', 'Comments are off for this post' ); ?></li>
-                                                                               <li class="wc-single-search"><strong>Search</strong> <?php get_search_form(); ?></li>   
-
-                                                                       </ul>                                     
-                                                               </div><!-- .entry-meta -->
-
-                                                               <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-                                                                       <h1 class="entry-title"><?php the_title(); ?></h1>
-
-                                                                       <div class="entry-content">
-                                                                               <?php the_content(); ?>
-                                                                               <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
-                                                                       </div><!-- .entry-content -->
-
-                                                               </div><!-- #post-## -->
-
-                                                               <?php comments_template( '', true ); ?>
-
-                                       <?php endwhile; // have_posts ?>
-                               <?php endif; // have_posts ?>
-
-                       </div><!-- #content -->
-               </div><!-- #container -->
-
-<?php get_footer(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Single post template.
+ */
+
+get_header(); ?>
+
+               <div id="container">
+                       <a href="<?php echo home_url( '/news/' ); ?>" class="wc-back-link"><span class="arrow">&larr;</span> Back to WordCamp News</a>
+
+                       <div id="content" role="main">
+
+                               <?php if ( have_posts() ) : ?>
+                                       <?php while ( have_posts() ) : the_post(); ?>
+
+                                                               <div class="entry-meta">
+                                                                       <ul>
+                                                                               <li class="wc-single-avatar"><?php echo get_avatar( get_the_author_meta('ID'), 140 ); ?></li>
+                                                                               <li class="wc-single-author"><strong>Posted by</strong> <?php the_author_posts_link(); ?></li>
+                                                                               <li class="wc-single-date"><strong>Posted on</strong> <?php the_date(); ?></li>
+                                                                               <li class="wc-single-cats"><strong>Categories</strong> <?php echo get_the_category_list(', '); ?></li>
+                                                                               <?php if ( has_tag() ) : ?>
+                                                                                       <li><strong>Tags</strong> <?php the_tags(' '); ?></li>
+                                                                               <?php endif; ?>
+                                                                               <li><?php comments_popup_link('No replies yet', '1 reply', '% replies', 'comments-link', 'Comments are off for this post' ); ?></li>
+                                                                               <li class="wc-single-search"><strong>Search</strong> <?php get_search_form(); ?></li>
+
+                                                                       </ul>
+                                                               </div><!-- .entry-meta -->
+
+                                                               <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+                                                                       <h1 class="entry-title"><?php the_title(); ?></h1>
+
+                                                                       <div class="entry-content">
+                                                                               <?php the_content(); ?>
+                                                                               <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+                                                                       </div><!-- .entry-content -->
+
+                                                               </div><!-- #post-## -->
+
+                                                               <?php comments_template( '', true ); ?>
+
+                                       <?php endwhile; // have_posts ?>
+                               <?php endif; // have_posts ?>
+
+                       </div><!-- #content -->
+               </div><!-- #container -->
+
+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012tagphp"></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/themes/wordcamp-central-2012/tag.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/themes/wordcamp-central-2012/tag.php      2016-09-12 19:10:03 UTC (rev 4037)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/tag.php        2016-09-12 19:10:09 UTC (rev 4038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,37 +1,37 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Tag archives template
- */
-?>
-<?php get_header(); ?>
-
-       <div id="container" class="group">
-               <div id="content" role="main" class="group">
-
-                       <h1 class="page-title"><?php
-                               printf( __( 'Tag Archives: %s', 'twentyten' ), '<span>' . single_tag_title( '', false ) . '</span>' );
-                       ?></h1>
-                                       
-                       <?php get_search_form(); ?>
-
-                       <?php get_template_part( 'navigation-above' ); ?>
-
-                       <?php while ( have_posts() ) : the_post(); ?>
-
-                                       <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-
-                                               <?php get_template_part( 'content', get_post_format() ); ?>
-
-                                       </div><!-- #post-## -->
-
-                       <?php endwhile; // End the loop. Whew. ?>
-
-                       <?php get_template_part( 'navigation-below' ); ?>
-
-               </div><!-- #content -->
-
-       </div><!-- #container -->
-
-       <?php get_sidebar(); ?>
-
-<?php get_footer(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Tag archives template
+ */
+?>
+<?php get_header(); ?>
+
+       <div id="container" class="group">
+               <div id="content" role="main" class="group">
+
+                       <h1 class="page-title"><?php
+                               printf( __( 'Tag Archives: %s', 'twentyten' ), '<span>' . single_tag_title( '', false ) . '</span>' );
+                       ?></h1>
+
+                       <?php get_search_form(); ?>
+
+                       <?php get_template_part( 'navigation-above' ); ?>
+
+                       <?php while ( have_posts() ) : the_post(); ?>
+
+                                       <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+
+                                               <?php get_template_part( 'content', get_post_format() ); ?>
+
+                                       </div><!-- #post-## -->
+
+                       <?php endwhile; // End the loop. Whew. ?>
+
+                       <?php get_template_part( 'navigation-below' ); ?>
+
+               </div><!-- #content -->
+
+       </div><!-- #container -->
+
+       <?php get_sidebar(); ?>
+
+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012templatehomephp"></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/themes/wordcamp-central-2012/template-home.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/themes/wordcamp-central-2012/template-home.php    2016-09-12 19:10:03 UTC (rev 4037)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/template-home.php      2016-09-12 19:10:09 UTC (rev 4038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,197 +1,197 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Template Name: WordCamp Home
- *
- * The home page template.
- */
-
-get_header(); ?>
-
-       <div id="wc-content-blocks" class="group">
-
-
-               <div class="wc-upcoming">
-                       <h3><strong>Upcoming</strong> WordCamps</h3>
-
-                       <?php // Get the upcoming WordCamps
-                       if ( function_exists( 'wcpt_has_wordcamps' ) &&
-                               wcpt_has_wordcamps( array(
-                                       'post_status' => WordCamp_Loader::get_public_post_statuses(),
-                                       'posts_per_page' => 5,
-                                       'meta_key'       => 'Start Date (YYYY-mm-dd)',
-                                       'orderby'        => 'meta_value',
-                                       'order'          => 'ASC',
-                                       'meta_query'     => array( array(
-                                               'key'        => 'Start Date (YYYY-mm-dd)',
-                                               'value'      => strtotime( '-2 days' ),
-                                               'compare'    => '>'
-                                       ) )
-                               ) )
-                       ) :
-                       ?>
-
-                       <ul>
-                       <?php while ( wcpt_wordcamps() ) : wcpt_the_wordcamp(); ?>
-
-                               <li>
-                                       <a href="<?php wcpt_wordcamp_permalink(); ?>"><strong><?php wcpt_wordcamp_title(); ?></strong>
-                                               <?php WordCamp_Central_Theme::the_wordcamp_date(); ?>
-                                       </a>
-                               </li>
-
-                       <?php endwhile; // wcpt_wordcamps ?>
-                       </ul>
-                       <a href="<?php echo home_url( '/schedule/' ); ?>" class="more">More WordCamps &rarr;</a>
-
-                       <?php endif; // wcpt_has_wordcamps ?>
-
-               </div><!-- .wc-upcoming -->
-
-               <div class="wc-news">
-
-                       <h3><strong>News</strong></h3>
-
-                       <?php
-                               // Removes links and other post formats from the home page
-                               // props mfields: http://wordpress.mfields.org/2011/post-format-queries/
-                               $formats = get_post_format_slugs();
-                               foreach ( (array) $formats as $i => $format )
-                                       $formats[$i] = 'post-format-' . $format;
-
-                               $news = new WP_Query( array(
-                                       'posts_per_page' => 1,
-                                       'ignore_sticky_posts' => 1,
-                                       'tax_query' => array(
-                                               array(
-                                                       'taxonomy'      => 'post_format',
-                                                       'field'         => 'slug',
-                                                       'terms'         => $formats,
-                                                       'operator'      => 'NOT IN',
-                                               )
-                                       )
-                               ) );
-                       ?>
-                       <?php if ( $news->have_posts() ) : $post_counter = 0; ?>
-                               <?php while ( $news->have_posts() ) : $news->the_post(); ?>
-                                       <?php $news_class_last = 'last'; // (bool) ( ++$post_counter % 2 ) ? '' : 'last'; ?>
-
-                       <div class="news-item <?php echo $news_class_last; ?>">
-                               <h4><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h4>
-                               <span class="wc-news-meta">by <?php the_author_posts_link(); ?> on <strong><?php the_date(); ?></strong></span>
-                               <?php the_excerpt('keep reading'); ?>
-                               <a href="<?php the_permalink(); ?>" class="wc-news-more">Keep Reading &raquo;</a>
-                       </div>
-
-                               <?php endwhile; ?>
-                       <?php endif; ?>
-
-                       <a href="<?php echo home_url( '/news/' ); ?>" class="more">More News &rarr;</a>
-
-               </div><!-- .wc-news -->
-
-               <div class="wc-tweets last">
-                       <h3><strong>Latest Tweets</strong></h3>
-
-                       <div id="wc-tweets-spinner" class="spinner spinner-visible"></div>
-                       <ul id="wc-tweets-container" class="transparent"></ul>
-
-                       <p id="wc-tweets-error" class="hidden" hidden>
-                               Tweets from <a href="https://twitter.com/wordcamp">@WordCamp</a> are currently unavailable.
-                       </p>
-
-                       <a href="https://twitter.com/wordcamp" class="more">Follow @WordCamp on Twitter &rarr;</a>
-
-                       <script id="tmpl-wc-tweet" type="text/html">
-                               <li>
-                                       <div class="wc-tweet-content">{{{tweet.text}}}</div>
-
-                                       <p class="wc-tweet-timestamp">
-                                               <a href="https://twitter.com/wordcamp/status/{{tweet.id_str}}">{{tweet.time_ago}}</a>
-                                       </p>
-
-                                       <ul class="wc-tweet-actions clearfix">
-                                               <li class="wc-tweet-action-reply">
-                                                       <a href="https://twitter.com/intent/tweet?in_reply_to={{tweet.id_str}}">
-                                                               <span class="wc-tweet-action-icon"></span>
-                                                               Reply
-                                                       </a>
-                                               </li>
-
-                                               <li class="wc-tweet-action-retweet">
-                                                       <a href="https://twitter.com/intent/retweet?tweet_id={{tweet.id_str}}">
-                                                               <span class="wc-tweet-action-icon"></span>
-                                                               Retweet
-                                                       </a>
-                                               </li>
-
-                                               <li class="wc-tweet-action-favorite">
-                                                       <a href="https://twitter.com/intent/favorite?tweet_id={{tweet.id_str}}">
-                                                               <span class="wc-tweet-action-icon"></span>
-                                                               Favorite
-                                                       </a>
-                                               </li>
-                                       </ul>
-                               </li>
-                       </script>
-               </div>  <!-- .wc-tweets -->
-
-       </div> <!-- #wc-content-blocks -->
-       <?php
-               /*
-               $photos = WordCamp_Central_Theme::get_photos();
-               $main_photo = false;
-               shuffle( $photos );
-
-               foreach ( $photos as $key => $photo ) {
-                       if ( $photo['l_width'] > 473 && $photo['width'] > $photo['height'] ) {
-                               $main_photo = $photo;
-                               unset( $photos[$key] );
-                               break;
-                       }
-               }
-               $photos = array_slice( $photos, 0, 5 );
-       ?>
-       <div id="wc-media" class="group">
-
-               <div class="wc-media-photos">
-                       <h3><a href="http://www.flickr.com/photos/tags/wordcampsf/"><strong>WordCamps</strong> in Photos</a></h3>
-                       <a href="http://www.flickr.com/photos/tags/wordcampsf/" class="wc-media-more">More Photos &rarr;</a>
-
-                       <?php if ( $main_photo ) : ?>
-                       <a href="<?php echo esc_url( $main_photo['url'] ); ?>" class="wc-media-photo-main">
-                               <img src="<?php echo esc_url( $main_photo['l_url'] ); ?>" alt="<?php echo esc_attr( $main_photo['title'] ); ?>" title="<?php echo esc_attr( $main_photo['title'] ); ?>" width="446" />
-                       </a>
-                       <?php endif; ?>
-
-                       <?php foreach ( $photos as $photo ) : ?>
-                       <a href="<?php echo esc_url( $photo['url'] ); ?>" class="wc-media-photo-thumb">
-                               <img src="<?php echo esc_url( $photo['t_url'] ); ?>" alt="<?php echo esc_attr( $photo['title'] ); ?>" title="<?php echo esc_attr( $photo['title'] ); ?>" width="75" height=75" />
-                       </a>
-                       <?php endforeach; ?>
-
-               </div><!-- .wc-media-photos -->
-
-
-               <?php $videos = WordCamp_Central_Theme::get_videos(); ?>
-
-               <div class="wc-media-videos">
-                       <h3><a href="http://wordpress.tv/category/wordcamptv/"><strong>WordCamp</strong>TV</a></h3>
-                       <a href="http://wordpress.tv/category/wordcamptv/" class="wc-media-more">More @ WordCamp.tv &rarr;</a>
-                       <ul>
-                               <?php foreach( $videos as $video ) : ?>
-                               <li>
-                                       <a href="<?php echo esc_url( $video['permalink'] ); ?>">
-                                               <img src="<?php echo esc_url( $video['thumbnail'] ); ?>" class="wc-media-video-thumb" alt="<?php echo esc_attr( $video['title'] ); ?>" width="128" />
-                                               <h4 class="wc-video-title"><?php echo apply_filters( 'the_title', $video['title'] ); ?></h4>
-                                               <!-- <span class="wc-video-wordcamp">WordCamp Los Angeles</span> -->
-                                       </a>
-                               </li>
-                               <?php endforeach; ?>
-                       </ul>
-               </div><!-- .wc-media-videos -->
-
-       </div><!-- .wc-media -->
-
-       */ ?>
-
-<?php get_footer(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Template Name: WordCamp Home
+ *
+ * The home page template.
+ */
+
+get_header(); ?>
+
+       <div id="wc-content-blocks" class="group">
+
+
+               <div class="wc-upcoming">
+                       <h3><strong>Upcoming</strong> WordCamps</h3>
+
+                       <?php // Get the upcoming WordCamps
+                       if ( function_exists( 'wcpt_has_wordcamps' ) &&
+                               wcpt_has_wordcamps( array(
+                                       'post_status' => WordCamp_Loader::get_public_post_statuses(),
+                                       'posts_per_page' => 5,
+                                       'meta_key'       => 'Start Date (YYYY-mm-dd)',
+                                       'orderby'        => 'meta_value',
+                                       'order'          => 'ASC',
+                                       'meta_query'     => array( array(
+                                               'key'        => 'Start Date (YYYY-mm-dd)',
+                                               'value'      => strtotime( '-2 days' ),
+                                               'compare'    => '>'
+                                       ) )
+                               ) )
+                       ) :
+                       ?>
+
+                       <ul>
+                       <?php while ( wcpt_wordcamps() ) : wcpt_the_wordcamp(); ?>
+
+                               <li>
+                                       <a href="<?php wcpt_wordcamp_permalink(); ?>"><strong><?php wcpt_wordcamp_title(); ?></strong>
+                                               <?php WordCamp_Central_Theme::the_wordcamp_date(); ?>
+                                       </a>
+                               </li>
+
+                       <?php endwhile; // wcpt_wordcamps ?>
+                       </ul>
+                       <a href="<?php echo home_url( '/schedule/' ); ?>" class="more">More WordCamps &rarr;</a>
+
+                       <?php endif; // wcpt_has_wordcamps ?>
+
+               </div><!-- .wc-upcoming -->
+
+               <div class="wc-news">
+
+                       <h3><strong>News</strong></h3>
+
+                       <?php
+                               // Removes links and other post formats from the home page
+                               // props mfields: http://wordpress.mfields.org/2011/post-format-queries/
+                               $formats = get_post_format_slugs();
+                               foreach ( (array) $formats as $i => $format )
+                                       $formats[$i] = 'post-format-' . $format;
+
+                               $news = new WP_Query( array(
+                                       'posts_per_page' => 1,
+                                       'ignore_sticky_posts' => 1,
+                                       'tax_query' => array(
+                                               array(
+                                                       'taxonomy'      => 'post_format',
+                                                       'field'         => 'slug',
+                                                       'terms'         => $formats,
+                                                       'operator'      => 'NOT IN',
+                                               )
+                                       )
+                               ) );
+                       ?>
+                       <?php if ( $news->have_posts() ) : $post_counter = 0; ?>
+                               <?php while ( $news->have_posts() ) : $news->the_post(); ?>
+                                       <?php $news_class_last = 'last'; // (bool) ( ++$post_counter % 2 ) ? '' : 'last'; ?>
+
+                       <div class="news-item <?php echo $news_class_last; ?>">
+                               <h4><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h4>
+                               <span class="wc-news-meta">by <?php the_author_posts_link(); ?> on <strong><?php the_date(); ?></strong></span>
+                               <?php the_excerpt('keep reading'); ?>
+                               <a href="<?php the_permalink(); ?>" class="wc-news-more">Keep Reading &raquo;</a>
+                       </div>
+
+                               <?php endwhile; ?>
+                       <?php endif; ?>
+
+                       <a href="<?php echo home_url( '/news/' ); ?>" class="more">More News &rarr;</a>
+
+               </div><!-- .wc-news -->
+
+               <div class="wc-tweets last">
+                       <h3><strong>Latest Tweets</strong></h3>
+
+                       <div id="wc-tweets-spinner" class="spinner spinner-visible"></div>
+                       <ul id="wc-tweets-container" class="transparent"></ul>
+
+                       <p id="wc-tweets-error" class="hidden" hidden>
+                               Tweets from <a href="https://twitter.com/wordcamp">@WordCamp</a> are currently unavailable.
+                       </p>
+
+                       <a href="https://twitter.com/wordcamp" class="more">Follow @WordCamp on Twitter &rarr;</a>
+
+                       <script id="tmpl-wc-tweet" type="text/html">
+                               <li>
+                                       <div class="wc-tweet-content">{{{tweet.text}}}</div>
+
+                                       <p class="wc-tweet-timestamp">
+                                               <a href="https://twitter.com/wordcamp/status/{{tweet.id_str}}">{{tweet.time_ago}}</a>
+                                       </p>
+
+                                       <ul class="wc-tweet-actions clearfix">
+                                               <li class="wc-tweet-action-reply">
+                                                       <a href="https://twitter.com/intent/tweet?in_reply_to={{tweet.id_str}}">
+                                                               <span class="wc-tweet-action-icon"></span>
+                                                               Reply
+                                                       </a>
+                                               </li>
+
+                                               <li class="wc-tweet-action-retweet">
+                                                       <a href="https://twitter.com/intent/retweet?tweet_id={{tweet.id_str}}">
+                                                               <span class="wc-tweet-action-icon"></span>
+                                                               Retweet
+                                                       </a>
+                                               </li>
+
+                                               <li class="wc-tweet-action-favorite">
+                                                       <a href="https://twitter.com/intent/favorite?tweet_id={{tweet.id_str}}">
+                                                               <span class="wc-tweet-action-icon"></span>
+                                                               Favorite
+                                                       </a>
+                                               </li>
+                                       </ul>
+                               </li>
+                       </script>
+               </div>  <!-- .wc-tweets -->
+
+       </div> <!-- #wc-content-blocks -->
+       <?php
+               /*
+               $photos = WordCamp_Central_Theme::get_photos();
+               $main_photo = false;
+               shuffle( $photos );
+
+               foreach ( $photos as $key => $photo ) {
+                       if ( $photo['l_width'] > 473 && $photo['width'] > $photo['height'] ) {
+                               $main_photo = $photo;
+                               unset( $photos[$key] );
+                               break;
+                       }
+               }
+               $photos = array_slice( $photos, 0, 5 );
+       ?>
+       <div id="wc-media" class="group">
+
+               <div class="wc-media-photos">
+                       <h3><a href="http://www.flickr.com/photos/tags/wordcampsf/"><strong>WordCamps</strong> in Photos</a></h3>
+                       <a href="http://www.flickr.com/photos/tags/wordcampsf/" class="wc-media-more">More Photos &rarr;</a>
+
+                       <?php if ( $main_photo ) : ?>
+                       <a href="<?php echo esc_url( $main_photo['url'] ); ?>" class="wc-media-photo-main">
+                               <img src="<?php echo esc_url( $main_photo['l_url'] ); ?>" alt="<?php echo esc_attr( $main_photo['title'] ); ?>" title="<?php echo esc_attr( $main_photo['title'] ); ?>" width="446" />
+                       </a>
+                       <?php endif; ?>
+
+                       <?php foreach ( $photos as $photo ) : ?>
+                       <a href="<?php echo esc_url( $photo['url'] ); ?>" class="wc-media-photo-thumb">
+                               <img src="<?php echo esc_url( $photo['t_url'] ); ?>" alt="<?php echo esc_attr( $photo['title'] ); ?>" title="<?php echo esc_attr( $photo['title'] ); ?>" width="75" height=75" />
+                       </a>
+                       <?php endforeach; ?>
+
+               </div><!-- .wc-media-photos -->
+
+
+               <?php $videos = WordCamp_Central_Theme::get_videos(); ?>
+
+               <div class="wc-media-videos">
+                       <h3><a href="http://wordpress.tv/category/wordcamptv/"><strong>WordCamp</strong>TV</a></h3>
+                       <a href="http://wordpress.tv/category/wordcamptv/" class="wc-media-more">More @ WordCamp.tv &rarr;</a>
+                       <ul>
+                               <?php foreach( $videos as $video ) : ?>
+                               <li>
+                                       <a href="<?php echo esc_url( $video['permalink'] ); ?>">
+                                               <img src="<?php echo esc_url( $video['thumbnail'] ); ?>" class="wc-media-video-thumb" alt="<?php echo esc_attr( $video['title'] ); ?>" width="128" />
+                                               <h4 class="wc-video-title"><?php echo apply_filters( 'the_title', $video['title'] ); ?></h4>
+                                               <!-- <span class="wc-video-wordcamp">WordCamp Los Angeles</span> -->
+                                       </a>
+                               </li>
+                               <?php endforeach; ?>
+                       </ul>
+               </div><!-- .wc-media-videos -->
+
+       </div><!-- .wc-media -->
+
+       */ ?>
+
+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012templatepastwordcampsphp"></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/themes/wordcamp-central-2012/template-past-wordcamps.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/themes/wordcamp-central-2012/template-past-wordcamps.php  2016-09-12 19:10:03 UTC (rev 4037)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/template-past-wordcamps.php    2016-09-12 19:10:09 UTC (rev 4038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,87 +1,87 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
-/**
- * Template Name: Past WordCamps
- *
- * A custom page template for the Past WordCamps list.
- *
- */
-
-get_header(); ?>
-
-               <div id="container" class="wc-schedule">
-                       <div id="content" role="main">
-
-                               <?php if ( have_posts() ) : the_post(); ?>
-
-                               <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-                                       <h1 class="entry-title"><?php the_title(); ?></h1>
-                                       <div class="entry-content">
-                                               <?php the_content(); ?>
-                                       </div><!-- .entry-content -->
-                               </div><!-- #post-## -->
-
-                               <?php endif; // end of the loop. ?>
-
-                                       <?php // Get the closed WordCamps
-                                       if ( function_exists( 'wcpt_has_wordcamps' ) &&
-                                               wcpt_has_wordcamps( array(
-                                                       'post_status' => array(
-                                                               'wcpt-closed',
-
-                                                               // back-compat
-                                                               'publish',
-                                                       ),
-                                                       'posts_per_page' => -1,
-                                                       'meta_key'       => 'Start Date (YYYY-mm-dd)',
-                                                       'orderby'        => 'meta_value',
-                                                       'order'          => 'DESC',
-                                                       'meta_query'     => array( array(
-                                                               'key'        => 'Start Date (YYYY-mm-dd)',
-                                                               'value'      => strtotime( '-2 days' ),
-                                                               'compare'    => '<'
-                                                       ) )
-                                               ) )
-                                       ) :
-                                               global $wcpt_template;
-                                               $wordcamps = WordCamp_Central_Theme::group_wordcamps_by_year( $wcpt_template->posts );
-                                       ?>
-
-                                       <?php foreach ( $wordcamps as $year => $posts ) : ?>
-                                               <h3 class="wc-schedule-year"><?php echo esc_html( $year ); ?></h3>
-
-                                               <ul class="wc-schedule-list">
-                                                       <?php foreach ( $posts as $post ) : setup_postdata( $post ); ?>
-
-                                                               <li>
-                                                                       <a href="<?php echo esc_url( WordCamp_Central_Theme::get_best_wordcamp_url( $post->ID ) ); ?>">
-                                                                               <?php if ( has_post_thumbnail() ) : ?>
-                                                                                       <?php the_post_thumbnail( 'wccentral-thumbnail-past', array( 'class' => 'wc-image' ) ); ?>
-                                                                               <?php else : ?>
-                                                                                       <div class="wc-image wp-post-image past-wordcamp-placeholder-thumb" title="<?php the_title(); ?>"></div>
-                                                                               <?php endif; ?>
-
-                                                                               <h2 class="wc-title"><?php wcpt_wordcamp_title(); ?></h2>
-                                                                               <span class="wc-country"><?php wcpt_wordcamp_location( $post->ID ); ?></span>
-
-                                                                               <span class="wc-date">
-                                                                                       <?php WordCamp_Central_Theme::the_wordcamp_date( $post->ID ); ?>,
-                                                                                       <?php wcpt_wordcamp_start_date( $post->ID, 'Y' ); ?>
-                                                                               </span>
-                                                                       </a>
-                                                               </li>
-
-                                                       <?php endforeach; ?>
-                                               </ul>
-                                       <?php wp_reset_postdata(); endforeach; ?>
-
-                               <a href="<?php echo home_url( '/schedule/' ); ?>" class="wc-schedule-more"><span class="arrow">&larr;</span> Upcoming WordCamps</a>
-
-                               <?php endif; // wcpt_has_wordcamps ?>
-
-                       </div><!-- #content -->
-               </div><!-- #container -->
-
-<?php
-       /*get_sidebar( 'schedule' ); */
-       get_footer();
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+/**
+ * Template Name: Past WordCamps
+ *
+ * A custom page template for the Past WordCamps list.
+ *
+ */
+
+get_header(); ?>
+
+               <div id="container" class="wc-schedule">
+                       <div id="content" role="main">
+
+                               <?php if ( have_posts() ) : the_post(); ?>
+
+                               <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+                                       <h1 class="entry-title"><?php the_title(); ?></h1>
+                                       <div class="entry-content">
+                                               <?php the_content(); ?>
+                                       </div><!-- .entry-content -->
+                               </div><!-- #post-## -->
+
+                               <?php endif; // end of the loop. ?>
+
+                                       <?php // Get the closed WordCamps
+                                       if ( function_exists( 'wcpt_has_wordcamps' ) &&
+                                               wcpt_has_wordcamps( array(
+                                                       'post_status' => array(
+                                                               'wcpt-closed',
+
+                                                               // back-compat
+                                                               'publish',
+                                                       ),
+                                                       'posts_per_page' => -1,
+                                                       'meta_key'       => 'Start Date (YYYY-mm-dd)',
+                                                       'orderby'        => 'meta_value',
+                                                       'order'          => 'DESC',
+                                                       'meta_query'     => array( array(
+                                                               'key'        => 'Start Date (YYYY-mm-dd)',
+                                                               'value'      => strtotime( '-2 days' ),
+                                                               'compare'    => '<'
+                                                       ) )
+                                               ) )
+                                       ) :
+                                               global $wcpt_template;
+                                               $wordcamps = WordCamp_Central_Theme::group_wordcamps_by_year( $wcpt_template->posts );
+                                       ?>
+
+                                       <?php foreach ( $wordcamps as $year => $posts ) : ?>
+                                               <h3 class="wc-schedule-year"><?php echo esc_html( $year ); ?></h3>
+
+                                               <ul class="wc-schedule-list">
+                                                       <?php foreach ( $posts as $post ) : setup_postdata( $post ); ?>
+
+                                                               <li>
+                                                                       <a href="<?php echo esc_url( WordCamp_Central_Theme::get_best_wordcamp_url( $post->ID ) ); ?>">
+                                                                               <?php if ( has_post_thumbnail() ) : ?>
+                                                                                       <?php the_post_thumbnail( 'wccentral-thumbnail-past', array( 'class' => 'wc-image' ) ); ?>
+                                                                               <?php else : ?>
+                                                                                       <div class="wc-image wp-post-image past-wordcamp-placeholder-thumb" title="<?php the_title(); ?>"></div>
+                                                                               <?php endif; ?>
+
+                                                                               <h2 class="wc-title"><?php wcpt_wordcamp_title(); ?></h2>
+                                                                               <span class="wc-country"><?php wcpt_wordcamp_location( $post->ID ); ?></span>
+
+                                                                               <span class="wc-date">
+                                                                                       <?php WordCamp_Central_Theme::the_wordcamp_date( $post->ID ); ?>,
+                                                                                       <?php wcpt_wordcamp_start_date( $post->ID, 'Y' ); ?>
+                                                                               </span>
+                                                                       </a>
+                                                               </li>
+
+                                                       <?php endforeach; ?>
+                                               </ul>
+                                       <?php wp_reset_postdata(); endforeach; ?>
+
+                               <a href="<?php echo home_url( '/schedule/' ); ?>" class="wc-schedule-more"><span class="arrow">&larr;</span> Upcoming WordCamps</a>
+
+                               <?php endif; // wcpt_has_wordcamps ?>
+
+                       </div><!-- #content -->
+               </div><!-- #container -->
+
+<?php
+       /*get_sidebar( 'schedule' ); */
+       get_footer();
+?>
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012templateschedulephp"></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/themes/wordcamp-central-2012/template-schedule.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/themes/wordcamp-central-2012/template-schedule.php        2016-09-12 19:10:03 UTC (rev 4037)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/template-schedule.php  2016-09-12 19:10:09 UTC (rev 4038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,82 +1,82 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Template Name: WordCamp Schedule
- *
- * A custom page template for the Upcoming WordCamp schedule.
- *
- */
-
-get_header(); ?>
-
-               <div id="container" class="wc-schedule">
-                       <div id="content" role="main">
-
-                               <?php if ( have_posts() ) : the_post(); ?>
-
-                               <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-                                       <h1 class="entry-title"><?php the_title(); ?></h1>
-                                       <div class="entry-content">
-                                               <?php the_content(); ?>
-                                       </div><!-- .entry-content -->
-                               </div><!-- #post-## -->
-
-                               <?php endif; // end of the loop. ?>
-
-                                       <?php // Get the upcoming approved (published) WordCamps
-                                       if ( function_exists( 'wcpt_has_wordcamps' ) &&
-                                               wcpt_has_wordcamps( array(
-                                                       'post_status' => WordCamp_Loader::get_public_post_statuses(),
-                                                       'posts_per_page' => -1,
-                                                       'meta_key'       => 'Start Date (YYYY-mm-dd)',
-                                                       'orderby'        => 'meta_value',
-                                                       'order'          => 'ASC',
-                                                       'meta_query'     => array( array(
-                                                               'key'        => 'Start Date (YYYY-mm-dd)',
-                                                               'value'      => strtotime( '-2 days' ),
-                                                               'compare'    => '>'
-                                                       ) )
-                                               ) )
-                                       ) :
-                                       ?>
-
-                                       <ul class="wc-schedule-list">
-                                       <?php while ( wcpt_wordcamps() ) : wcpt_the_wordcamp(); ?>
-
-                                               <li>
-                                                       <a href="<?php echo esc_url( wcpt_get_wordcamp_url() ); ?>">
-                                                               <?php if ( has_post_thumbnail() ) : ?>
-                                                                       <?php the_post_thumbnail( 'wccentral-thumbnail-small', array( 'class' => 'wc-image' ) ); ?>
-                                                               <?php else : ?>
-                                                                       <div class="wc-image wp-post-image wordcamp-placeholder-thumb" title="<?php the_title(); ?>"></div>
-                                                               <?php endif; ?>
-
-                                                               <h2 class="wc-title"><?php wcpt_wordcamp_title(); ?></h2>
-                                                               <span class="wc-country"><?php wcpt_wordcamp_location(); ?></span>
-                                                               <span class="wc-date">
-                                                                       <?php WordCamp_Central_Theme::the_wordcamp_date(); ?>
-                                                               </span>
-                                                       </a>
-                                               </li>
-
-                                       <?php endwhile; // wcpt_wordcamps ?>
-                               </ul>
-                               <a href="<?php echo home_url( '/schedule/past-wordcamps/' ); ?>" class="wc-schedule-more">Past WordCamps &rarr;</a>
-
-                               <?php endif; // wcpt_has_wordcamps ?>
-
-                               <h2>Keeping Track of Upcoming WordCamps</h2>
-
-                               <p>In addition to the list above, there are a few other ways you can keep track of upcoming WordCamps:</p>
-
-                               <ul>
-                                       <li><strong>RSS Feed</strong> -- Learn <a href="https://central.wordcamp.org/news/2013/12/30/rss-feed-now-available-for-newly-announced-wordcamps/">how to subscribe via RSS</a>.</li>
-                                       <li><strong>ICS Calendar</strong> -- Add this URL as a remote calendar in your calendar application to subscribe: <?php echo esc_url( site_url( 'calendar.ics' ) ); ?></li>
-                                       <li><strong>JSON API</strong> -- This can be used by developers of mobile apps, websites, etc: https://central.wordcamp.org/wp-json/posts?type=wordcamp</li>    <?php // URL is hardcoded because the v2 URL for this will probably be different, but back-compat will be maintained ?>
-                               </ul>
-
-                       </div><!-- #content -->
-               </div><!-- #container -->
-
-<?php
-       get_sidebar( 'schedule' );
-       get_footer();
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Template Name: WordCamp Schedule
+ *
+ * A custom page template for the Upcoming WordCamp schedule.
+ *
+ */
+
+get_header(); ?>
+
+               <div id="container" class="wc-schedule">
+                       <div id="content" role="main">
+
+                               <?php if ( have_posts() ) : the_post(); ?>
+
+                               <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+                                       <h1 class="entry-title"><?php the_title(); ?></h1>
+                                       <div class="entry-content">
+                                               <?php the_content(); ?>
+                                       </div><!-- .entry-content -->
+                               </div><!-- #post-## -->
+
+                               <?php endif; // end of the loop. ?>
+
+                                       <?php // Get the upcoming approved (published) WordCamps
+                                       if ( function_exists( 'wcpt_has_wordcamps' ) &&
+                                               wcpt_has_wordcamps( array(
+                                                       'post_status' => WordCamp_Loader::get_public_post_statuses(),
+                                                       'posts_per_page' => -1,
+                                                       'meta_key'       => 'Start Date (YYYY-mm-dd)',
+                                                       'orderby'        => 'meta_value',
+                                                       'order'          => 'ASC',
+                                                       'meta_query'     => array( array(
+                                                               'key'        => 'Start Date (YYYY-mm-dd)',
+                                                               'value'      => strtotime( '-2 days' ),
+                                                               'compare'    => '>'
+                                                       ) )
+                                               ) )
+                                       ) :
+                                       ?>
+
+                                       <ul class="wc-schedule-list">
+                                       <?php while ( wcpt_wordcamps() ) : wcpt_the_wordcamp(); ?>
+
+                                               <li>
+                                                       <a href="<?php echo esc_url( wcpt_get_wordcamp_url() ); ?>">
+                                                               <?php if ( has_post_thumbnail() ) : ?>
+                                                                       <?php the_post_thumbnail( 'wccentral-thumbnail-small', array( 'class' => 'wc-image' ) ); ?>
+                                                               <?php else : ?>
+                                                                       <div class="wc-image wp-post-image wordcamp-placeholder-thumb" title="<?php the_title(); ?>"></div>
+                                                               <?php endif; ?>
+
+                                                               <h2 class="wc-title"><?php wcpt_wordcamp_title(); ?></h2>
+                                                               <span class="wc-country"><?php wcpt_wordcamp_location(); ?></span>
+                                                               <span class="wc-date">
+                                                                       <?php WordCamp_Central_Theme::the_wordcamp_date(); ?>
+                                                               </span>
+                                                       </a>
+                                               </li>
+
+                                       <?php endwhile; // wcpt_wordcamps ?>
+                               </ul>
+                               <a href="<?php echo home_url( '/schedule/past-wordcamps/' ); ?>" class="wc-schedule-more">Past WordCamps &rarr;</a>
+
+                               <?php endif; // wcpt_has_wordcamps ?>
+
+                               <h2>Keeping Track of Upcoming WordCamps</h2>
+
+                               <p>In addition to the list above, there are a few other ways you can keep track of upcoming WordCamps:</p>
+
+                               <ul>
+                                       <li><strong>RSS Feed</strong> -- Learn <a href="https://central.wordcamp.org/news/2013/12/30/rss-feed-now-available-for-newly-announced-wordcamps/">how to subscribe via RSS</a>.</li>
+                                       <li><strong>ICS Calendar</strong> -- Add this URL as a remote calendar in your calendar application to subscribe: <?php echo esc_url( site_url( 'calendar.ics' ) ); ?></li>
+                                       <li><strong>JSON API</strong> -- This can be used by developers of mobile apps, websites, etc: https://central.wordcamp.org/wp-json/posts?type=wordcamp</li>    <?php // URL is hardcoded because the v2 URL for this will probably be different, but back-compat will be maintained ?>
+                               </ul>
+
+                       </div><!-- #content -->
+               </div><!-- #container -->
+
+<?php
+       get_sidebar( 'schedule' );
+       get_footer();
</ins></span></pre>
</div>
</div>

</body>
</html>