<!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>[7705] sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/loop.php: WordCamp Base: Apply coding standards.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/7705">7705</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/7705","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>2018-09-25 22:28:44 +0000 (Tue, 25 Sep 2018)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WordCamp Base: Apply coding standards.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaseloopphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/loop.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaseloopphp"></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-base/loop.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-base/loop.php     2018-09-25 22:28:41 UTC (rev 7704)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/loop.php       2018-09-25 22:28:44 UTC (rev 7705)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,22 +1,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**
- * The loop that displays posts.
- *
- * 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.php or
- * loop-template.php, where 'template' is the loop context
- * requested by a template. For example, loop-index.php would
- * be used if it exists and we ask for the loop with:
- * <code>get_template_part( 'loop', 'index' );</code>
- *
- * @package WordPress
- * @subpackage Twenty_Ten
- * @since Twenty Ten 1.0
- */
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> $gallery_term = get_term_by( 'name', _x( 'gallery', 'gallery category slug', 'wordcamporg' ), 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $gallery_term ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,146 +10,182 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php /* Display navigation to next/previous pages when applicable */ ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $wp_query->max_num_pages > 1 ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">        <div id="nav-above" class="navigation">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'wordcamporg' ) ); ?></div>
-               <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'wordcamporg' ) ); ?></div>
-       </div><!-- #nav-above -->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <div class="nav-previous">
+                       <?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'wordcamporg' ) ); ?>
+               </div>
+
+               <div class="nav-next">
+                       <?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'wordcamporg' ) ); ?>
+               </div>
+       </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> <?php /* If there are no posts to display, such as an empty archive page */ ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! have_posts() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">        <div id="post-0" class="post error404 not-found">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <h1 class="entry-title"><?php _e( 'Not Found', 'wordcamporg' ); ?></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <h1 class="entry-title">
+                       <?php _e( 'Not Found', 'wordcamporg' ); ?>
+               </h1>
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 <div class="entry-content">
</span><span class="cx" style="display: block; padding: 0 10px">                        <p><?php _e( 'Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'wordcamporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">                        <?php get_search_form(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                </div><!-- .entry-content -->
-       </div><!-- #post-0 -->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         </div>
+       </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-       /* Start the Loop.
-        *
-        * In Twenty Ten we use the same loop in multiple contexts.
-        * It is broken into three main parts: when we're displaying
-        * posts that are in the gallery category, when we're displaying
-        * posts in the asides category, and finally all other posts.
-        *
-        * Additionally, we sometimes check for whether we are on an
-        * archive page, a search page, etc., allowing for small differences
-        * in the loop on each template without actually duplicating
-        * the rest of the loop that is shared.
-        *
-        * Without further ado, the loop:
-        */ ?>
</del><span class="cx" style="display: block; padding: 0 10px"> <?php while ( have_posts() ) : the_post(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-<?php /* How to display posts in the Gallery category. */ ?>
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php /* How to display posts in the Gallery category. */ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">         <?php if ( $gallery_term && in_category( $gallery_term->term_id ) ) : ?>
</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">-                        <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcamporg' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <h2 class="entry-title">
+                               <a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcamporg' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark">
+                                       <?php the_title(); ?>
+                               </a>
+                       </h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px">                                <?php twentyten_posted_on(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        </div><!-- .entry-meta -->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="entry-content">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( post_password_required() ) : ?>
-                               <?php the_content(); ?>
-<?php else : ?>                  
-                               <?php 
-                                       $images = get_children( array( 'post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php if ( post_password_required() ) : ?>
+                                       <?php the_content(); ?>
+                               <?php else : ?>
+                                       <?php
+                                       $images = get_children( array(
+                                               'post_parent'    => $post->ID,
+                                               'post_type'      => 'attachment',
+                                               'post_mime_type' => 'image',
+                                               'orderby'        => 'menu_order',
+                                               'order'          => 'ASC',
+                                               'numberposts'    => 999,
+                                       ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( $images ) :
</span><span class="cx" style="display: block; padding: 0 10px">                                                $total_images = count( $images );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                $image = array_shift( $images );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         $image         = array_shift( $images );
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 $image_img_tag = wp_get_attachment_image( $image->ID, 'thumbnail' );
</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="gallery-thumb">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo $image_img_tag; ?></a>
-                                               </div><!-- .gallery-thumb -->
-                                               <p><em><?php printf( __( 'This gallery contains <a %1$s>%2$s photos</a>.', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 <a class="size-thumbnail" href="<?php the_permalink(); ?>">
+                                                               <?php echo $image_img_tag; ?>
+                                                       </a>
+                                               </div>
+
+                                               <p><em>
+                                                       <?php printf(
+                                                               __( 'This gallery contains <a %1$s>%2$s photos</a>.', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__( 'Permalink to %s', 'wordcamporg' ), the_title_attribute( 'echo=0' ) ) . '" rel="bookmark"',
</span><span class="cx" style="display: block; padding: 0 10px">                                                                $total_images
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        ); ?></em></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 ); ?>
+                                               </em></p>
+                                       <?php endif; ?>
+
+                                       <?php the_excerpt(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">                                 <?php endif; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <?php the_excerpt(); ?>
-<?php endif; ?>
</del><span class="cx" style="display: block; padding: 0 10px">                         </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="entry-utility">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <a href="<?php echo get_term_link( $gallery_term->term_id, 'category' ); ?>"
-                                  title="<?php esc_attr_e( 'View posts in the Gallery category', 'wordcamporg' ); ?>"><?php _e( 'More Galleries', 'wordcamporg' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <a href="<?php echo get_term_link( $gallery_term->term_id, 'category' ); ?>" title="<?php esc_attr_e( 'View posts in the Gallery category', 'wordcamporg' ); ?>">
+                                       <?php _e( 'More Galleries', 'wordcamporg' ); ?>
+                               </a>
</ins><span class="cx" style="display: block; padding: 0 10px">                                 <span class="meta-sep">|</span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'wordcamporg' ), __( '1 Comment', 'wordcamporg' ), __( '% Comments', 'wordcamporg' ) ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <span class="comments-link">
+                                       <?php comments_popup_link( __( 'Leave a comment', 'wordcamporg' ), __( '1 Comment', 'wordcamporg' ), __( '% Comments', 'wordcamporg' ) ); ?>
+                               </span>
+
</ins><span class="cx" style="display: block; padding: 0 10px">                                 <?php edit_post_link( __( 'Edit', 'wordcamporg' ), '<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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 </div>
</ins><span class="cx" style="display: block; padding: 0 10px">                 </div><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php /* How to display posts in the asides category */ ?>
-
-       <?php elseif ( in_category( _x('asides', 'asides category slug', 'wordcamporg') ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php /* How to display posts in the asides category */ ?>
+       <?php elseif ( in_category( _x( 'asides', 'asides category slug', 'wordcamporg' ) ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">                 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        <?php if ( is_archive() || is_search() ) : // Display excerpts for archives and search. ?>
+                               <div class="entry-summary">
+                                       <?php the_excerpt(); ?>
+                               </div>
+                       <?php else : ?>
+                               <div class="entry-content">
+                                       <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'wordcamporg' ) ); ?>
+                               </div>
+                       <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php if ( is_archive() || is_search() ) : // Display excerpts for archives and search. ?>
-                       <div class="entry-summary">
-                               <?php the_excerpt(); ?>
-                       </div><!-- .entry-summary -->
-               <?php else : ?>
-                       <div class="entry-content">
-                               <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'wordcamporg' ) ); ?>
-                       </div><!-- .entry-content -->
-               <?php endif; ?>
-
</del><span class="cx" style="display: block; padding: 0 10px">                         <div class="entry-utility">
</span><span class="cx" style="display: block; padding: 0 10px">                                <?php twentyten_posted_on(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                <span class="meta-sep">|</span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'wordcamporg' ), __( '1 Comment', 'wordcamporg' ), __( '% Comments', 'wordcamporg' ) ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <span class="comments-link">
+                                       <?php comments_popup_link( __( 'Leave a comment', 'wordcamporg' ), __( '1 Comment', 'wordcamporg' ), __( '% Comments', 'wordcamporg' ) ); ?>
+                               </span>
</ins><span class="cx" style="display: block; padding: 0 10px">                                 <?php edit_post_link( __( 'Edit', 'wordcamporg' ), '<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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 </div>
</ins><span class="cx" style="display: block; padding: 0 10px">                 </div><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php /* How to display all other posts. */ ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php /* How to display all other posts. */ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        <?php else : ?>
</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">-                        <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcamporg' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <h2 class="entry-title">
+                               <a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcamporg' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark">
+                                       <?php the_title(); ?>
+                               </a>
+                       </h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px">                                <?php twentyten_posted_on(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        </div><!-- .entry-meta -->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <?php if ( is_archive() || is_search() ) : // Only display excerpts for archives and search. ?>
-                       <div class="entry-summary">
-                               <?php the_excerpt(); ?>
-                       </div><!-- .entry-summary -->
-       <?php else : ?>
-                       <div class="entry-content">
-                               <?php the_content( sprintf(
-                                       // translators: The title of the post to continue reading
-                                       __( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'wordcamporg' ),
-                                       the_title( '<span class="screen-reader-text">', '</span> ', false )
-                               ) ); ?>
-                               <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'wordcamporg' ), 'after' => '</div>' ) ); ?>
-                       </div><!-- .entry-content -->
-       <?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php if ( is_archive() || is_search() ) : // Only display excerpts for archives and search. ?>
+                               <div class="entry-summary">
+                                       <?php the_excerpt(); ?>
+                               </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        <?php else : ?>
+                               <div class="entry-content">
+                                       <?php the_content( sprintf(
+                                               // translators: The title of the post to continue reading
+                                               __( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'wordcamporg' ),
+                                               the_title( '<span class="screen-reader-text">', '</span> ', false )
+                                       ) ); ?>
+
+                                       <?php wp_link_pages( array(
+                                               'before' => '<div class="page-link">' . __( 'Pages:', 'wordcamporg' ),
+                                               'after'  => '</div>',
+                                       ) ); ?>
+                               </div>
+                       <?php endif; ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px">                         <div class="entry-utility">
</span><span class="cx" style="display: block; padding: 0 10px">                                <?php if ( count( get_the_category() ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <span class="cat-links">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'wordcamporg' ), 'entry-utility-prep entry-utility-prep-cat-links', get_the_category_list( ', ' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <?php printf(
+                                                       __( '<span class="%1$s">Posted in</span> %2$s', 'wordcamporg' ),
+                                                       'entry-utility-prep entry-utility-prep-cat-links',
+                                                       get_the_category_list( ', ' )
+                                               ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         </span>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <span class="meta-sep">|</span>
</span><span class="cx" style="display: block; padding: 0 10px">                                <?php endif; ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px">                                 <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $tags_list = get_the_tag_list( '', ', ' );
-                                       if ( $tags_list ):
-                               ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $tags_list = get_the_tag_list( '', ', ' );
+                               if ( $tags_list ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <span class="tag-links">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'wordcamporg' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <?php printf(
+                                                       __( '<span class="%1$s">Tagged</span> %2$s', 'wordcamporg' ),
+                                                       'entry-utility-prep entry-utility-prep-tag-links',
+                                                       $tags_list
+                                               ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         </span>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <span class="meta-sep">|</span>
</span><span class="cx" style="display: block; padding: 0 10px">                                <?php endif; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'wordcamporg' ), __( '1 Comment', 'wordcamporg' ), __( '% Comments', 'wordcamporg' ) ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+                               <span class="comments-link">
+                                       <?php comments_popup_link( __( 'Leave a comment', 'wordcamporg' ), __( '1 Comment', 'wordcamporg' ), __( '% Comments', 'wordcamporg' ) ); ?>
+                               </span>
+
</ins><span class="cx" style="display: block; padding: 0 10px">                                 <?php edit_post_link( __( 'Edit', 'wordcamporg' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                        </div><!-- .entry-utility -->
</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- #post-## -->
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,13 +193,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">                <?php comments_template( '', true ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        <?php endif; // This was the if statement that broke the loop into three parts based on categories. ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile; // End the loop. Whew. ?>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> <?php /* Display navigation to next/previous pages when applicable */ ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if (  $wp_query->max_num_pages > 1 ) : ?>
-                               <div id="nav-below" class="navigation">
-                                       <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'wordcamporg' ) ); ?></div>
-                                       <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'wordcamporg' ) ); ?></div>
-                               </div><!-- #nav-below -->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php if ( $wp_query->max_num_pages > 1 ) : ?>
+       <div id="nav-below" class="navigation">
+               <div class="nav-previous">
+                       <?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'wordcamporg' ) ); ?>
+               </div>
+
+               <div class="nav-next">
+                       <?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'wordcamporg' ) ); ?>
+               </div>
+       </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span></span></pre>
</div>
</div>

</body>
</html>