Inspection of "Merge upstream changes and resolve merge conflict!" - ntwb/wordpress - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( d99bf9...491baf )

by Stephen

created 2017-06-20 00:41 UTC

Spacing +41 added lines, -41 removed lines patch added patch discarded remove patch

@@ -20,19 +20,19 @@  discard block
 block discarded – undo
 ?>
 
 <?php /* Display navigation to next/previous pages when applicable */ ?>
-<?php if ( $wp_query->max_num_pages > 1 ) : ?>
+<?php if ($wp_query->max_num_pages > 1) : ?>
 	<div id="nav-above" class="navigation">
-		<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' ) ); ?></div>
-		<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?></div>
+		<div class="nav-previous"><?php next_posts_link(__('<span class="meta-nav">&larr;</span> Older posts', 'twentyten')); ?></div>
+		<div class="nav-next"><?php previous_posts_link(__('Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten')); ?></div>
 	</div><!-- #nav-above -->
 <?php endif; ?>
 
 <?php /* If there are no posts to display, such as an empty archive page */ ?>
-<?php if ( ! have_posts() ) : ?>
+<?php if ( ! have_posts()) : ?>
 	<div id="post-0" class="post error404 not-found">
-		<h1 class="entry-title"><?php _e( 'Not Found', 'twentyten' ); ?></h1>
+		<h1 class="entry-title"><?php _e('Not Found', 'twentyten'); ?></h1>
 		<div class="entry-content">
-			<p><?php _e( 'Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'twentyten' ); ?></p>
+			<p><?php _e('Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'twentyten'); ?></p>
 			<?php get_search_form(); ?>
 		</div><!-- .entry-content -->
 	</div><!-- #post-0 -->
@@ -55,11 +55,11 @@  discard block
 block discarded – undo
 	 * Without further ado, the loop:
 	 */
 ?>
-<?php while ( have_posts() ) : the_post(); ?>
+<?php while (have_posts()) : the_post(); ?>
 
 <?php /* How to display posts of the Gallery format. The gallery category is the old way. */ ?>
 
-	<?php if ( ( function_exists( 'get_post_format' ) && 'gallery' == get_post_format( $post->ID ) ) || in_category( _x( 'gallery', 'gallery category slug', 'twentyten' ) ) ) : ?>
+	<?php if ((function_exists('get_post_format') && 'gallery' == get_post_format($post->ID)) || in_category(_x('gallery', 'gallery category slug', 'twentyten'))) : ?>
 		<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 			<h2 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
 
@@ -68,21 +68,21 @@  discard block
 block discarded – undo
 			</div><!-- .entry-meta -->
 
 			<div class="entry-content">
-<?php if ( post_password_required() ) : ?>
+<?php if (post_password_required()) : ?>
 				<?php the_content(); ?>
 <?php else : ?>
 				<?php
 					$images = twentyten_get_gallery_images();
-					if ( $images ) :
-						$total_images = count( $images );
-						$image = reset( $images );
+					if ($images) :
+						$total_images = count($images);
+						$image = reset($images);
 				?>
 						<div class="gallery-thumb">
-							<a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo wp_get_attachment_image( $image, 'thumbnail' ); ?></a>
+							<a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo wp_get_attachment_image($image, 'thumbnail'); ?></a>
 						</div><!-- .gallery-thumb -->
-						<p><em><?php printf( _n( 'This gallery contains <a %1$s>%2$s photo</a>.', 'This gallery contains <a %1$s>%2$s photos</a>.', $total_images, 'twentyten' ),
-								'href="' . esc_url( get_permalink() ) . '" title="' . esc_attr( sprintf( __( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ) ) . '" rel="bookmark"',
-								number_format_i18n( $total_images )
+						<p><em><?php printf(_n('This gallery contains <a %1$s>%2$s photo</a>.', 'This gallery contains <a %1$s>%2$s photos</a>.', $total_images, 'twentyten'),
+								'href="'.esc_url(get_permalink()).'" title="'.esc_attr(sprintf(__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0'))).'" rel="bookmark"',
+								number_format_i18n($total_images)
 							); ?></em></p>
 				<?php endif; // end twentyten_get_gallery_images() check ?>
 						<?php the_excerpt(); ?>
@@ -90,38 +90,38 @@  discard block
 block discarded – undo
 			</div><!-- .entry-content -->
 
 			<div class="entry-utility">
-			<?php if ( function_exists( 'get_post_format' ) && 'gallery' == get_post_format( $post->ID ) ) : ?>
-				<a href="<?php echo esc_url( get_post_format_link( 'gallery' ) ); ?>" title="<?php esc_attr_e( 'View Galleries', 'twentyten' ); ?>"><?php _e( 'More Galleries', 'twentyten' ); ?></a>
+			<?php if (function_exists('get_post_format') && 'gallery' == get_post_format($post->ID)) : ?>
+				<a href="<?php echo esc_url(get_post_format_link('gallery')); ?>" title="<?php esc_attr_e('View Galleries', 'twentyten'); ?>"><?php _e('More Galleries', 'twentyten'); ?></a>
 				<span class="meta-sep">|</span>
-			<?php elseif ( $gallery = get_term_by( 'slug', _x( 'gallery', 'gallery category slug', 'twentyten' ), 'category' ) && in_category( $gallery->term_id ) ) : ?>
-				<a href="<?php echo esc_url( get_category_link( $gallery ) ); ?>" title="<?php esc_attr_e( 'View posts in the Gallery category', 'twentyten' ); ?>"><?php _e( 'More Galleries', 'twentyten' ); ?></a>
+			<?php elseif ($gallery = get_term_by('slug', _x('gallery', 'gallery category slug', 'twentyten'), 'category') && in_category($gallery->term_id)) : ?>
+				<a href="<?php echo esc_url(get_category_link($gallery)); ?>" title="<?php esc_attr_e('View posts in the Gallery category', 'twentyten'); ?>"><?php _e('More Galleries', 'twentyten'); ?></a>
 				<span class="meta-sep">|</span>
 			<?php endif; ?>
-				<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
-				<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
+				<span class="comments-link"><?php comments_popup_link(__('Leave a comment', 'twentyten'), __('1 Comment', 'twentyten'), __('% Comments', 'twentyten')); ?></span>
+				<?php edit_post_link(__('Edit', 'twentyten'), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>'); ?>
 			</div><!-- .entry-utility -->
 		</div><!-- #post-## -->
 
 <?php /* How to display posts of the Aside format. The asides category is the old way. */ ?>
 
-	<?php elseif ( ( function_exists( 'get_post_format' ) && 'aside' == get_post_format( $post->ID ) ) || in_category( _x( 'asides', 'asides category slug', 'twentyten' ) )  ) : ?>
+	<?php elseif ((function_exists('get_post_format') && 'aside' == get_post_format($post->ID)) || in_category(_x('asides', 'asides category slug', 'twentyten'))) : ?>
 		<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-		<?php if ( is_archive() || is_search() ) : // Display excerpts for archives and search. ?>
+		<?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>', 'twentyten' ) ); ?>
+				<?php the_content(__('Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten')); ?>
 			</div><!-- .entry-content -->
 		<?php endif; ?>
 
 			<div class="entry-utility">
 				<?php twentyten_posted_on(); ?>
 				<span class="meta-sep">|</span>
-				<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
-				<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
+				<span class="comments-link"><?php comments_popup_link(__('Leave a comment', 'twentyten'), __('1 Comment', 'twentyten'), __('% Comments', 'twentyten')); ?></span>
+				<?php edit_post_link(__('Edit', 'twentyten'), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>'); ?>
 			</div><!-- .entry-utility -->
 		</div><!-- #post-## -->
 
@@ -135,48 +135,48 @@  discard block
 block discarded – undo
 				<?php twentyten_posted_on(); ?>
 			</div><!-- .entry-meta -->
 
-	<?php if ( is_archive() || is_search() ) : // Only display excerpts for archives and search. ?>
+	<?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( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
-				<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</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 -->
 	<?php endif; ?>
 
 			<div class="entry-utility">
-				<?php if ( count( get_the_category() ) ) : ?>
+				<?php if (count(get_the_category())) : ?>
 					<span class="cat-links">
-						<?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyten' ), 'entry-utility-prep entry-utility-prep-cat-links', get_the_category_list( ', ' ) ); ?>
+						<?php printf(__('<span class="%1$s">Posted in</span> %2$s', 'twentyten'), 'entry-utility-prep entry-utility-prep-cat-links', get_the_category_list(', ')); ?>
 					</span>
 					<span class="meta-sep">|</span>
 				<?php endif; ?>
 				<?php
-					$tags_list = get_the_tag_list( '', ', ' );
-					if ( $tags_list ):
+					$tags_list = get_the_tag_list('', ', ');
+					if ($tags_list):
 				?>
 					<span class="tag-links">
-						<?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentyten' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list ); ?>
+						<?php printf(__('<span class="%1$s">Tagged</span> %2$s', 'twentyten'), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list); ?>
 					</span>
 					<span class="meta-sep">|</span>
 				<?php endif; ?>
-				<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
-				<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
+				<span class="comments-link"><?php comments_popup_link(__('Leave a comment', 'twentyten'), __('1 Comment', 'twentyten'), __('% Comments', 'twentyten')); ?></span>
+				<?php edit_post_link(__('Edit', 'twentyten'), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>'); ?>
 			</div><!-- .entry-utility -->
 		</div><!-- #post-## -->
 
-		<?php comments_template( '', true ); ?>
+		<?php comments_template('', true); ?>
 
 	<?php endif; // This was the if statement that broke the loop into three parts based on categories. ?>
 
 <?php endwhile; // End the loop. Whew. ?>
 
 <?php /* Display navigation to next/previous pages when applicable */ ?>
-<?php if (  $wp_query->max_num_pages > 1 ) : ?>
+<?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', 'twentyten' ) ); ?></div>
-					<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?></div>
+					<div class="nav-previous"><?php next_posts_link(__('<span class="meta-nav">&larr;</span> Older posts', 'twentyten')); ?></div>
+					<div class="nav-next"><?php previous_posts_link(__('Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten')); ?></div>
 				</div><!-- #nav-below -->
 <?php endif; ?>

Please login to merge, or discard this patch.

Braces +18 added lines, -7 removed lines patch added patch discarded remove patch

@@ -70,9 +70,11 @@  discard block
 block discarded – undo
 			<div class="entry-content">
 <?php if ( post_password_required() ) : ?>
 				<?php the_content(); ?>
-<?php else : ?>
+<?php else {
+	: ?>
 				<?php
 					$images = twentyten_get_gallery_images();
+}
 					if ( $images ) :
 						$total_images = count( $images );
 						$image = reset( $images );
@@ -111,9 +113,12 @@  discard block
 block discarded – undo
 			<div class="entry-summary">
 				<?php the_excerpt(); ?>
 			</div><!-- .entry-summary -->
-		<?php else : ?>
+		<?php else {
+	: ?>
 			<div class="entry-content">
-				<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+				<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) );
+}
+?>
 			</div><!-- .entry-content -->
 		<?php endif; ?>
 
@@ -127,8 +132,11 @@  discard block
 block discarded – undo
 
 <?php /* How to display all other posts. */ ?>
 
-	<?php else : ?>
-		<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+	<?php else {
+	: ?>
+		<div id="post-<?php the_ID();
+}
+?>" <?php post_class(); ?>>
 			<h2 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
 
 			<div class="entry-meta">
@@ -139,9 +147,12 @@  discard block
 block discarded – undo
 			<div class="entry-summary">
 				<?php the_excerpt(); ?>
 			</div><!-- .entry-summary -->
-	<?php else : ?>
+	<?php else {
+	: ?>
 			<div class="entry-content">
-				<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+				<?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 -->
 	<?php endif; ?>

Please login to merge, or discard this patch.

src/wp-content/themes/twentyten/404.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -13,9 +13,9 @@
 block discarded – undo
 		<div id="content" role="main">
 
 			<div id="post-0" class="post error404 not-found">
-				<h1 class="entry-title"><?php _e( 'Not Found', 'twentyten' ); ?></h1>
+				<h1 class="entry-title"><?php _e('Not Found', 'twentyten'); ?></h1>
 				<div class="entry-content">
-					<p><?php _e( 'Apologies, but the page you requested could not be found. Perhaps searching will help.', 'twentyten' ); ?></p>
+					<p><?php _e('Apologies, but the page you requested could not be found. Perhaps searching will help.', 'twentyten'); ?></p>
 					<?php get_search_form(); ?>
 				</div><!-- .entry-content -->
 			</div><!-- #post-0 -->

Please login to merge, or discard this patch.

src/wp-content/themes/twentyten/comments.php 1 patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -14,8 +14,8 @@  discard block
 block discarded – undo
 ?>
 
 			<div id="comments">
-<?php if ( post_password_required() ) : ?>
-				<p class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'twentyten' ); ?></p>
+<?php if (post_password_required()) : ?>
+				<p class="nopassword"><?php _e('This post is password protected. Enter the password to view any comments.', 'twentyten'); ?></p>
 			</div><!-- #comments -->
 <?php
 		/*
@@ -31,16 +31,16 @@  discard block
 block discarded – undo
 	// You can start editing here -- including this comment!
 ?>
 
-<?php if ( have_comments() ) : ?>
+<?php if (have_comments()) : ?>
 			<h3 id="comments-title"><?php
-			printf( _n( 'One Response to %2$s', '%1$s Responses to %2$s', get_comments_number(), 'twentyten' ),
-			number_format_i18n( get_comments_number() ), '<em>' . get_the_title() . '</em>' );
+			printf(_n('One Response to %2$s', '%1$s Responses to %2$s', get_comments_number(), 'twentyten'),
+			number_format_i18n(get_comments_number()), '<em>'.get_the_title().'</em>');
 			?></h3>
 
-<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
+<?php if (get_comment_pages_count() > 1 && get_option('page_comments')) : // Are there comments to navigate through? ?>
 			<div class="navigation">
-				<div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">&larr;</span> Older Comments', 'twentyten' ) ); ?></div>
-				<div class="nav-next"><?php next_comments_link( __( 'Newer Comments <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?></div>
+				<div class="nav-previous"><?php previous_comments_link(__('<span class="meta-nav">&larr;</span> Older Comments', 'twentyten')); ?></div>
+				<div class="nav-next"><?php next_comments_link(__('Newer Comments <span class="meta-nav">&rarr;</span>', 'twentyten')); ?></div>
 			</div> <!-- .navigation -->
 <?php endif; // check for comment navigation ?>
 
@@ -53,14 +53,14 @@  discard block
 block discarded – undo
 					 * define twentyten_comment() and that will be used instead.
 					 * See twentyten_comment() in twentyten/functions.php for more.
 					 */
-					wp_list_comments( array( 'callback' => 'twentyten_comment' ) );
+					wp_list_comments(array('callback' => 'twentyten_comment'));
 				?>
 			</ol>
 
-<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
+<?php if (get_comment_pages_count() > 1 && get_option('page_comments')) : // Are there comments to navigate through? ?>
 			<div class="navigation">
-				<div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">&larr;</span> Older Comments', 'twentyten' ) ); ?></div>
-				<div class="nav-next"><?php next_comments_link( __( 'Newer Comments <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?></div>
+				<div class="nav-previous"><?php previous_comments_link(__('<span class="meta-nav">&larr;</span> Older Comments', 'twentyten')); ?></div>
+				<div class="nav-next"><?php next_comments_link(__('Newer Comments <span class="meta-nav">&rarr;</span>', 'twentyten')); ?></div>
 			</div><!-- .navigation -->
 <?php endif; // check for comment navigation ?>
 
@@ -69,9 +69,9 @@  discard block
 block discarded – undo
 	 * If there are no comments and comments are closed, let's leave a little note, shall we?
 	 * But we only want the note on posts and pages that had comments in the first place.
 	 */
-	if ( ! comments_open() && get_comments_number() ) : ?>
-		<p class="nocomments"><?php _e( 'Comments are closed.' , 'twentyten' ); ?></p>
-	<?php endif;  ?>
+	if ( ! comments_open() && get_comments_number()) : ?>
+		<p class="nocomments"><?php _e('Comments are closed.', 'twentyten'); ?></p>
+	<?php endif; ?>
 
 <?php endif; // end have_comments() ?>
 

Please login to merge, or discard this patch.

src/wp-content/themes/twentyfourteen/footer.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -14,11 +14,11 @@
 block discarded – undo
 
 		<footer id="colophon" class="site-footer" role="contentinfo">
 
-			<?php get_sidebar( 'footer' ); ?>
+			<?php get_sidebar('footer'); ?>
 
 			<div class="site-info">
-				<?php do_action( 'twentyfourteen_credits' ); ?>
-				<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyfourteen' ) ); ?>"><?php printf( __( 'Proudly powered by %s', 'twentyfourteen' ), 'WordPress' ); ?></a>
+				<?php do_action('twentyfourteen_credits'); ?>
+				<a href="<?php echo esc_url(__('https://wordpress.org/', 'twentyfourteen')); ?>"><?php printf(__('Proudly powered by %s', 'twentyfourteen'), 'WordPress'); ?></a>
 			</div><!-- .site-info -->
 		</footer><!-- #colophon -->
 	</div><!-- #page -->

Please login to merge, or discard this patch.

src/wp-content/themes/twentyfourteen/content-quote.php 2 patches

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -12,51 +12,51 @@
 block discarded – undo
 	<?php twentyfourteen_post_thumbnail(); ?>
 
 	<header class="entry-header">
-		<?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
+		<?php if (in_array('category', get_object_taxonomies(get_post_type())) && twentyfourteen_categorized_blog()) : ?>
 		<div class="entry-meta">
-			<span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
+			<span class="cat-links"><?php echo get_the_category_list(_x(', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen')); ?></span>
 		</div><!-- .entry-meta -->
 		<?php
 			endif;
 
-			if ( is_single() ) :
-				the_title( '<h1 class="entry-title">', '</h1>' );
+			if (is_single()) :
+				the_title('<h1 class="entry-title">', '</h1>');
 			else :
-				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
+				the_title('<h1 class="entry-title"><a href="'.esc_url(get_permalink()).'" rel="bookmark">', '</a></h1>');
 			endif;
 		?>
 
 		<div class="entry-meta">
 			<span class="post-format">
-				<a class="entry-format" href="<?php echo esc_url( get_post_format_link( 'quote' ) ); ?>"><?php echo get_post_format_string( 'quote' ); ?></a>
+				<a class="entry-format" href="<?php echo esc_url(get_post_format_link('quote')); ?>"><?php echo get_post_format_string('quote'); ?></a>
 			</span>
 
 			<?php twentyfourteen_posted_on(); ?>
 
-			<?php if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) : ?>
-			<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
+			<?php if ( ! post_password_required() && (comments_open() || get_comments_number())) : ?>
+			<span class="comments-link"><?php comments_popup_link(__('Leave a comment', 'twentyfourteen'), __('1 Comment', 'twentyfourteen'), __('% Comments', 'twentyfourteen')); ?></span>
 			<?php endif; ?>
 
-			<?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>
+			<?php edit_post_link(__('Edit', 'twentyfourteen'), '<span class="edit-link">', '</span>'); ?>
 		</div><!-- .entry-meta -->
 	</header><!-- .entry-header -->
 
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(sprintf(
+				__('Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen'),
+				the_title('<span class="screen-reader-text">', '</span>', false)
+			));
 
-			wp_link_pages( array(
-				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+			wp_link_pages(array(
+				'before'      => '<div class="page-links"><span class="page-links-title">'.__('Pages:', 'twentyfourteen').'</span>',
 				'after'       => '</div>',
 				'link_before' => '<span>',
 				'link_after'  => '</span>',
-			) );
+			));
 		?>
 	</div><!-- .entry-content -->
 
-	<?php the_tags( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' ); ?>
+	<?php the_tags('<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>'); ?>
 </article><!-- #post-## -->

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -21,8 +21,10 @@
 block discarded – undo
 
 			if ( is_single() ) :
 				the_title( '<h1 class="entry-title">', '</h1>' );
-			else :
+			else {
+				:
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
+			}
 			endif;
 		?>
 

Please login to merge, or discard this patch.

src/wp-content/themes/twentyfourteen/content-audio.php 2 patches

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -12,51 +12,51 @@
 block discarded – undo
 	<?php twentyfourteen_post_thumbnail(); ?>
 
 	<header class="entry-header">
-		<?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
+		<?php if (in_array('category', get_object_taxonomies(get_post_type())) && twentyfourteen_categorized_blog()) : ?>
 		<div class="entry-meta">
-			<span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
+			<span class="cat-links"><?php echo get_the_category_list(_x(', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen')); ?></span>
 		</div><!-- .entry-meta -->
 		<?php
 			endif;
 
-			if ( is_single() ) :
-				the_title( '<h1 class="entry-title">', '</h1>' );
+			if (is_single()) :
+				the_title('<h1 class="entry-title">', '</h1>');
 			else :
-				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
+				the_title('<h1 class="entry-title"><a href="'.esc_url(get_permalink()).'" rel="bookmark">', '</a></h1>');
 			endif;
 		?>
 
 		<div class="entry-meta">
 			<span class="post-format">
-				<a class="entry-format" href="<?php echo esc_url( get_post_format_link( 'audio' ) ); ?>"><?php echo get_post_format_string( 'audio' ); ?></a>
+				<a class="entry-format" href="<?php echo esc_url(get_post_format_link('audio')); ?>"><?php echo get_post_format_string('audio'); ?></a>
 			</span>
 
 			<?php twentyfourteen_posted_on(); ?>
 
-			<?php if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) : ?>
-			<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
+			<?php if ( ! post_password_required() && (comments_open() || get_comments_number())) : ?>
+			<span class="comments-link"><?php comments_popup_link(__('Leave a comment', 'twentyfourteen'), __('1 Comment', 'twentyfourteen'), __('% Comments', 'twentyfourteen')); ?></span>
 			<?php endif; ?>
 
-			<?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>
+			<?php edit_post_link(__('Edit', 'twentyfourteen'), '<span class="edit-link">', '</span>'); ?>
 		</div><!-- .entry-meta -->
 	</header><!-- .entry-header -->
 
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(sprintf(
+				__('Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen'),
+				the_title('<span class="screen-reader-text">', '</span>', false)
+			));
 
-			wp_link_pages( array(
-				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+			wp_link_pages(array(
+				'before'      => '<div class="page-links"><span class="page-links-title">'.__('Pages:', 'twentyfourteen').'</span>',
 				'after'       => '</div>',
 				'link_before' => '<span>',
 				'link_after'  => '</span>',
-			) );
+			));
 		?>
 	</div><!-- .entry-content -->
 
-	<?php the_tags( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' ); ?>
+	<?php the_tags('<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>'); ?>
 </article><!-- #post-## -->

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -21,8 +21,10 @@
 block discarded – undo
 
 			if ( is_single() ) :
 				the_title( '<h1 class="entry-title">', '</h1>' );
-			else :
+			else {
+				:
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
+			}
 			endif;
 		?>
 

Please login to merge, or discard this patch.

src/wp-content/themes/twentyfourteen/image.php 1 patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -18,20 +18,20 @@  discard block
 block discarded – undo
 
 	<?php
 		// Start the Loop.
-		while ( have_posts() ) : the_post();
+		while (have_posts()) : the_post();
 	?>
 			<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 				<header class="entry-header">
-					<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
+					<?php the_title('<h1 class="entry-title">', '</h1>'); ?>
 
 					<div class="entry-meta">
 
-						<span class="entry-date"><time class="entry-date" datetime="<?php echo esc_attr( get_the_date( 'c' ) ); ?>"><?php echo esc_html( get_the_date() ); ?></time></span>
+						<span class="entry-date"><time class="entry-date" datetime="<?php echo esc_attr(get_the_date('c')); ?>"><?php echo esc_html(get_the_date()); ?></time></span>
 
-						<span class="full-size-link"><a href="<?php echo esc_url( wp_get_attachment_url() ); ?>"><?php echo esc_html( $metadata['width'] ); ?> &times; <?php echo esc_html( $metadata['height'] ); ?></a></span>
+						<span class="full-size-link"><a href="<?php echo esc_url(wp_get_attachment_url()); ?>"><?php echo esc_html($metadata['width']); ?> &times; <?php echo esc_html($metadata['height']); ?></a></span>
 
-						<span class="parent-post-link"><a href="<?php echo esc_url( get_permalink( $post->post_parent ) ); ?>" rel="gallery"><?php echo get_the_title( $post->post_parent ); ?></a></span>
-						<?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>
+						<span class="parent-post-link"><a href="<?php echo esc_url(get_permalink($post->post_parent)); ?>" rel="gallery"><?php echo get_the_title($post->post_parent); ?></a></span>
+						<?php edit_post_link(__('Edit', 'twentyfourteen'), '<span class="edit-link">', '</span>'); ?>
 					</div><!-- .entry-meta -->
 				</header><!-- .entry-header -->
 
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
 							<?php twentyfourteen_the_attached_image(); ?>
 						</div><!-- .attachment -->
 
-						<?php if ( has_excerpt() ) : ?>
+						<?php if (has_excerpt()) : ?>
 						<div class="entry-caption">
 							<?php the_excerpt(); ?>
 						</div><!-- .entry-caption -->
@@ -50,20 +50,20 @@  discard block
 block discarded – undo
 
 					<?php
 						the_content();
-						wp_link_pages( array(
-							'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+						wp_link_pages(array(
+							'before'      => '<div class="page-links"><span class="page-links-title">'.__('Pages:', 'twentyfourteen').'</span>',
 							'after'       => '</div>',
 							'link_before' => '<span>',
 							'link_after'  => '</span>',
-						) );
+						));
 					?>
 				</div><!-- .entry-content -->
 			</article><!-- #post-## -->
 
 			<nav id="image-navigation" class="navigation image-navigation">
 				<div class="nav-links">
-				<?php previous_image_link( false, '<div class="previous-image">' . __( 'Previous Image', 'twentyfourteen' ) . '</div>' ); ?>
-				<?php next_image_link( false, '<div class="next-image">' . __( 'Next Image', 'twentyfourteen' ) . '</div>' ); ?>
+				<?php previous_image_link(false, '<div class="previous-image">'.__('Previous Image', 'twentyfourteen').'</div>'); ?>
+				<?php next_image_link(false, '<div class="next-image">'.__('Next Image', 'twentyfourteen').'</div>'); ?>
 				</div><!-- .nav-links -->
 			</nav><!-- #image-navigation -->
 

Please login to merge, or discard this patch.

src/wp-content/themes/twentyfourteen/content-gallery.php 2 patches

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -12,51 +12,51 @@
 block discarded – undo
 	<?php twentyfourteen_post_thumbnail(); ?>
 
 	<header class="entry-header">
-		<?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
+		<?php if (in_array('category', get_object_taxonomies(get_post_type())) && twentyfourteen_categorized_blog()) : ?>
 		<div class="entry-meta">
-			<span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
+			<span class="cat-links"><?php echo get_the_category_list(_x(', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen')); ?></span>
 		</div><!-- .entry-meta -->
 		<?php
 			endif;
 
-			if ( is_single() ) :
-				the_title( '<h1 class="entry-title">', '</h1>' );
+			if (is_single()) :
+				the_title('<h1 class="entry-title">', '</h1>');
 			else :
-				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
+				the_title('<h1 class="entry-title"><a href="'.esc_url(get_permalink()).'" rel="bookmark">', '</a></h1>');
 			endif;
 		?>
 
 		<div class="entry-meta">
 			<span class="post-format">
-				<a class="entry-format" href="<?php echo esc_url( get_post_format_link( 'gallery' ) ); ?>"><?php echo get_post_format_string( 'gallery' ); ?></a>
+				<a class="entry-format" href="<?php echo esc_url(get_post_format_link('gallery')); ?>"><?php echo get_post_format_string('gallery'); ?></a>
 			</span>
 
 			<?php twentyfourteen_posted_on(); ?>
 
-			<?php if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) : ?>
-			<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
+			<?php if ( ! post_password_required() && (comments_open() || get_comments_number())) : ?>
+			<span class="comments-link"><?php comments_popup_link(__('Leave a comment', 'twentyfourteen'), __('1 Comment', 'twentyfourteen'), __('% Comments', 'twentyfourteen')); ?></span>
 			<?php endif; ?>
 
-			<?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>
+			<?php edit_post_link(__('Edit', 'twentyfourteen'), '<span class="edit-link">', '</span>'); ?>
 		</div><!-- .entry-meta -->
 	</header><!-- .entry-header -->
 
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(sprintf(
+				__('Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen'),
+				the_title('<span class="screen-reader-text">', '</span>', false)
+			));
 
-			wp_link_pages( array(
-				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+			wp_link_pages(array(
+				'before'      => '<div class="page-links"><span class="page-links-title">'.__('Pages:', 'twentyfourteen').'</span>',
 				'after'       => '</div>',
 				'link_before' => '<span>',
 				'link_after'  => '</span>',
-			) );
+			));
 		?>
 	</div><!-- .entry-content -->
 
-	<?php the_tags( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' ); ?>
+	<?php the_tags('<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>'); ?>
 </article><!-- #post-## -->

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -21,8 +21,10 @@
 block discarded – undo
 
 			if ( is_single() ) :
 				the_title( '<h1 class="entry-title">', '</h1>' );
-			else :
+			else {
+				:
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
+			}
 			endif;
 		?>
 

Please login to merge, or discard this patch.

src/wp-content/themes/twentyfourteen/header.php 1 patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -19,11 +19,11 @@  discard block
 block discarded – undo
 <html <?php language_attributes(); ?>>
 <!--<![endif]-->
 <head>
-	<meta charset="<?php bloginfo( 'charset' ); ?>">
+	<meta charset="<?php bloginfo('charset'); ?>">
 	<meta name="viewport" content="width=device-width">
-	<title><?php wp_title( '|', true, 'right' ); ?></title>
+	<title><?php wp_title('|', true, 'right'); ?></title>
 	<link rel="profile" href="http://gmpg.org/xfn/11">
-	<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>">
+	<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>">
 	<!--[if lt IE 9]>
 	<script src="<?php echo get_template_directory_uri(); ?>/js/html5.js"></script>
 	<![endif]-->
@@ -32,26 +32,26 @@  discard block
 block discarded – undo
 
 <body <?php body_class(); ?>>
 <div id="page" class="hfeed site">
-	<?php if ( get_header_image() ) : ?>
+	<?php if (get_header_image()) : ?>
 	<div id="site-header">
-		<a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home">
-			<img src="<?php header_image(); ?>" width="<?php echo get_custom_header()->width; ?>" height="<?php echo get_custom_header()->height; ?>" alt="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>">
+		<a href="<?php echo esc_url(home_url('/')); ?>" rel="home">
+			<img src="<?php header_image(); ?>" width="<?php echo get_custom_header()->width; ?>" height="<?php echo get_custom_header()->height; ?>" alt="<?php echo esc_attr(get_bloginfo('name', 'display')); ?>">
 		</a>
 	</div>
 	<?php endif; ?>
 
 	<header id="masthead" class="site-header" role="banner">
 		<div class="header-main">
-			<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
+			<h1 class="site-title"><a href="<?php echo esc_url(home_url('/')); ?>" rel="home"><?php bloginfo('name'); ?></a></h1>
 
 			<div class="search-toggle">
-				<a href="#search-container" class="screen-reader-text" aria-expanded="false" aria-controls="search-container"><?php _e( 'Search', 'twentyfourteen' ); ?></a>
+				<a href="#search-container" class="screen-reader-text" aria-expanded="false" aria-controls="search-container"><?php _e('Search', 'twentyfourteen'); ?></a>
 			</div>
 
 			<nav id="primary-navigation" class="site-navigation primary-navigation" role="navigation">
-				<button class="menu-toggle"><?php _e( 'Primary Menu', 'twentyfourteen' ); ?></button>
-				<a class="screen-reader-text skip-link" href="#content"><?php _e( 'Skip to content', 'twentyfourteen' ); ?></a>
-				<?php wp_nav_menu( array( 'theme_location' => 'primary', 'menu_class' => 'nav-menu', 'menu_id' => 'primary-menu' ) ); ?>
+				<button class="menu-toggle"><?php _e('Primary Menu', 'twentyfourteen'); ?></button>
+				<a class="screen-reader-text skip-link" href="#content"><?php _e('Skip to content', 'twentyfourteen'); ?></a>
+				<?php wp_nav_menu(array('theme_location' => 'primary', 'menu_class' => 'nav-menu', 'menu_id' => 'primary-menu')); ?>
 			</nav>
 		</div>
 

Please login to merge, or discard this patch.

		@@ -20,19 +20,19 @@ discard block
		block discarded – undo
20	20	?>
21	21
22	22	<?php /* Display navigation to next/previous pages when applicable */ ?>
23		-<?php if ( $wp_query->max_num_pages > 1 ) : ?>
	23	+<?php if ($wp_query->max_num_pages > 1) : ?>
24	24	<div id="nav-above" class="navigation">
25		- <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">←</span> Older posts', 'twentyten' ) ); ?></div>
26		- <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">→</span>', 'twentyten' ) ); ?></div>
	25	+ <div class="nav-previous"><?php next_posts_link(__('<span class="meta-nav">←</span> Older posts', 'twentyten')); ?></div>
	26	+ <div class="nav-next"><?php previous_posts_link(__('Newer posts <span class="meta-nav">→</span>', 'twentyten')); ?></div>
27	27	</div><!-- #nav-above -->
28	28	<?php endif; ?>
29	29
30	30	<?php /* If there are no posts to display, such as an empty archive page */ ?>
31		-<?php if ( ! have_posts() ) : ?>
	31	+<?php if ( ! have_posts()) : ?>
32	32	<div id="post-0" class="post error404 not-found">
33		- <h1 class="entry-title"><?php _e( 'Not Found', 'twentyten' ); ?></h1>
	33	+ <h1 class="entry-title"><?php _e('Not Found', 'twentyten'); ?></h1>
34	34	<div class="entry-content">
35		- <p><?php _e( 'Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'twentyten' ); ?></p>
	35	+ <p><?php _e('Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'twentyten'); ?></p>
36	36	<?php get_search_form(); ?>
37	37	</div><!-- .entry-content -->
38	38	</div><!-- #post-0 -->
		@@ -55,11 +55,11 @@ discard block
		block discarded – undo
55	55	* Without further ado, the loop:
56	56	*/
57	57	?>
58		-<?php while ( have_posts() ) : the_post(); ?>
	58	+<?php while (have_posts()) : the_post(); ?>
59	59
60	60	<?php /* How to display posts of the Gallery format. The gallery category is the old way. */ ?>
61	61
62		- <?php if ( ( function_exists( 'get_post_format' ) && 'gallery' == get_post_format( $post->ID ) ) \|\| in_category( _x( 'gallery', 'gallery category slug', 'twentyten' ) ) ) : ?>
	62	+ <?php if ((function_exists('get_post_format') && 'gallery' == get_post_format($post->ID)) \|\| in_category(_x('gallery', 'gallery category slug', 'twentyten'))) : ?>
63	63	<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
64	64	<h2 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
65	65
		@@ -68,21 +68,21 @@ discard block
		block discarded – undo
68	68	</div><!-- .entry-meta -->
69	69
70	70	<div class="entry-content">
71		-<?php if ( post_password_required() ) : ?>
	71	+<?php if (post_password_required()) : ?>
72	72	<?php the_content(); ?>
73	73	<?php else : ?>
74	74	<?php
75	75	$images = twentyten_get_gallery_images();
76		- if ( $images ) :
77		- $total_images = count( $images );
78		- $image = reset( $images );
	76	+ if ($images) :
	77	+ $total_images = count($images);
	78	+ $image = reset($images);
79	79	?>
80	80	<div class="gallery-thumb">
81		- <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo wp_get_attachment_image( $image, 'thumbnail' ); ?></a>
	81	+ <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo wp_get_attachment_image($image, 'thumbnail'); ?></a>
82	82	</div><!-- .gallery-thumb -->
83		- <p><em><?php printf( _n( 'This gallery contains <a %1$s>%2$s photo</a>.', 'This gallery contains <a %1$s>%2$s photos</a>.', $total_images, 'twentyten' ),
84		- 'href="' . esc_url( get_permalink() ) . '" title="' . esc_attr( sprintf( __( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ) ) . '" rel="bookmark"',
85		- number_format_i18n( $total_images )
	83	+ <p><em><?php printf(_n('This gallery contains <a %1$s>%2$s photo</a>.', 'This gallery contains <a %1$s>%2$s photos</a>.', $total_images, 'twentyten'),
	84	+ 'href="'.esc_url(get_permalink()).'" title="'.esc_attr(sprintf(__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0'))).'" rel="bookmark"',
	85	+ number_format_i18n($total_images)
86	86	); ?></em></p>
87	87	<?php endif; // end twentyten_get_gallery_images() check ?>
88	88	<?php the_excerpt(); ?>
		@@ -90,38 +90,38 @@ discard block
		block discarded – undo
90	90	</div><!-- .entry-content -->
91	91
92	92	<div class="entry-utility">
93		- <?php if ( function_exists( 'get_post_format' ) && 'gallery' == get_post_format( $post->ID ) ) : ?>
94		- <a href="<?php echo esc_url( get_post_format_link( 'gallery' ) ); ?>" title="<?php esc_attr_e( 'View Galleries', 'twentyten' ); ?>"><?php _e( 'More Galleries', 'twentyten' ); ?></a>
	93	+ <?php if (function_exists('get_post_format') && 'gallery' == get_post_format($post->ID)) : ?>
	94	+ <a href="<?php echo esc_url(get_post_format_link('gallery')); ?>" title="<?php esc_attr_e('View Galleries', 'twentyten'); ?>"><?php _e('More Galleries', 'twentyten'); ?></a>
95	95	<span class="meta-sep">\|</span>
96		- <?php elseif ( $gallery = get_term_by( 'slug', _x( 'gallery', 'gallery category slug', 'twentyten' ), 'category' ) && in_category( $gallery->term_id ) ) : ?>
97		- <a href="<?php echo esc_url( get_category_link( $gallery ) ); ?>" title="<?php esc_attr_e( 'View posts in the Gallery category', 'twentyten' ); ?>"><?php _e( 'More Galleries', 'twentyten' ); ?></a>
	96	+ <?php elseif ($gallery = get_term_by('slug', _x('gallery', 'gallery category slug', 'twentyten'), 'category') && in_category($gallery->term_id)) : ?>
	97	+ <a href="<?php echo esc_url(get_category_link($gallery)); ?>" title="<?php esc_attr_e('View posts in the Gallery category', 'twentyten'); ?>"><?php _e('More Galleries', 'twentyten'); ?></a>
98	98	<span class="meta-sep">\|</span>
99	99	<?php endif; ?>
100		- <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
101		- <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">\|</span> <span class="edit-link">', '</span>' ); ?>
	100	+ <span class="comments-link"><?php comments_popup_link(__('Leave a comment', 'twentyten'), __('1 Comment', 'twentyten'), __('% Comments', 'twentyten')); ?></span>
	101	+ <?php edit_post_link(__('Edit', 'twentyten'), '<span class="meta-sep">\|</span> <span class="edit-link">', '</span>'); ?>
102	102	</div><!-- .entry-utility -->
103	103	</div><!-- #post-## -->
104	104
105	105	<?php /* How to display posts of the Aside format. The asides category is the old way. */ ?>
106	106
107		- <?php elseif ( ( function_exists( 'get_post_format' ) && 'aside' == get_post_format( $post->ID ) ) \|\| in_category( _x( 'asides', 'asides category slug', 'twentyten' ) ) ) : ?>
	107	+ <?php elseif ((function_exists('get_post_format') && 'aside' == get_post_format($post->ID)) \|\| in_category(_x('asides', 'asides category slug', 'twentyten'))) : ?>
108	108	<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
109	109
110		- <?php if ( is_archive() \|\| is_search() ) : // Display excerpts for archives and search. ?>
	110	+ <?php if (is_archive() \|\| is_search()) : // Display excerpts for archives and search. ?>
111	111	<div class="entry-summary">
112	112	<?php the_excerpt(); ?>
113	113	</div><!-- .entry-summary -->
114	114	<?php else : ?>
115	115	<div class="entry-content">
116		- <?php the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyten' ) ); ?>
	116	+ <?php the_content(__('Continue reading <span class="meta-nav">→</span>', 'twentyten')); ?>
117	117	</div><!-- .entry-content -->
118	118	<?php endif; ?>
119	119
120	120	<div class="entry-utility">
121	121	<?php twentyten_posted_on(); ?>
122	122	<span class="meta-sep">\|</span>
123		- <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
124		- <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">\|</span> <span class="edit-link">', '</span>' ); ?>
	123	+ <span class="comments-link"><?php comments_popup_link(__('Leave a comment', 'twentyten'), __('1 Comment', 'twentyten'), __('% Comments', 'twentyten')); ?></span>
	124	+ <?php edit_post_link(__('Edit', 'twentyten'), '<span class="meta-sep">\|</span> <span class="edit-link">', '</span>'); ?>
125	125	</div><!-- .entry-utility -->
126	126	</div><!-- #post-## -->
127	127
		@@ -135,48 +135,48 @@ discard block
		block discarded – undo
135	135	<?php twentyten_posted_on(); ?>
136	136	</div><!-- .entry-meta -->
137	137
138		- <?php if ( is_archive() \|\| is_search() ) : // Only display excerpts for archives and search. ?>
	138	+ <?php if (is_archive() \|\| is_search()) : // Only display excerpts for archives and search. ?>
139	139	<div class="entry-summary">
140	140	<?php the_excerpt(); ?>
141	141	</div><!-- .entry-summary -->
142	142	<?php else : ?>
143	143	<div class="entry-content">
144		- <?php the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyten' ) ); ?>
145		- <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
	144	+ <?php the_content(__('Continue reading <span class="meta-nav">→</span>', 'twentyten')); ?>
	145	+ <?php wp_link_pages(array('before' => '<div class="page-link">'.__('Pages:', 'twentyten'), 'after' => '</div>')); ?>
146	146	</div><!-- .entry-content -->
147	147	<?php endif; ?>
148	148
149	149	<div class="entry-utility">
150		- <?php if ( count( get_the_category() ) ) : ?>
	150	+ <?php if (count(get_the_category())) : ?>
151	151	<span class="cat-links">
152		- <?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyten' ), 'entry-utility-prep entry-utility-prep-cat-links', get_the_category_list( ', ' ) ); ?>
	152	+ <?php printf(__('<span class="%1$s">Posted in</span> %2$s', 'twentyten'), 'entry-utility-prep entry-utility-prep-cat-links', get_the_category_list(', ')); ?>
153	153	</span>
154	154	<span class="meta-sep">\|</span>
155	155	<?php endif; ?>
156	156	<?php
157		- $tags_list = get_the_tag_list( '', ', ' );
158		- if ( $tags_list ):
	157	+ $tags_list = get_the_tag_list('', ', ');
	158	+ if ($tags_list):
159	159	?>
160	160	<span class="tag-links">
161		- <?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentyten' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list ); ?>
	161	+ <?php printf(__('<span class="%1$s">Tagged</span> %2$s', 'twentyten'), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list); ?>
162	162	</span>
163	163	<span class="meta-sep">\|</span>
164	164	<?php endif; ?>
165		- <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
166		- <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">\|</span> <span class="edit-link">', '</span>' ); ?>
	165	+ <span class="comments-link"><?php comments_popup_link(__('Leave a comment', 'twentyten'), __('1 Comment', 'twentyten'), __('% Comments', 'twentyten')); ?></span>
	166	+ <?php edit_post_link(__('Edit', 'twentyten'), '<span class="meta-sep">\|</span> <span class="edit-link">', '</span>'); ?>
167	167	</div><!-- .entry-utility -->
168	168	</div><!-- #post-## -->
169	169
170		- <?php comments_template( '', true ); ?>
	170	+ <?php comments_template('', true); ?>
171	171
172	172	<?php endif; // This was the if statement that broke the loop into three parts based on categories. ?>
173	173
174	174	<?php endwhile; // End the loop. Whew. ?>
175	175
176	176	<?php /* Display navigation to next/previous pages when applicable */ ?>
177		-<?php if ( $wp_query->max_num_pages > 1 ) : ?>
	177	+<?php if ($wp_query->max_num_pages > 1) : ?>
178	178	<div id="nav-below" class="navigation">
179		- <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">←</span> Older posts', 'twentyten' ) ); ?></div>
180		- <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">→</span>', 'twentyten' ) ); ?></div>
	179	+ <div class="nav-previous"><?php next_posts_link(__('<span class="meta-nav">←</span> Older posts', 'twentyten')); ?></div>
	180	+ <div class="nav-next"><?php previous_posts_link(__('Newer posts <span class="meta-nav">→</span>', 'twentyten')); ?></div>
181	181	</div><!-- #nav-below -->
182	182	<?php endif; ?>

		@@ -70,9 +70,11 @@ discard block
		block discarded – undo
70	70	<div class="entry-content">
71	71	<?php if ( post_password_required() ) : ?>
72	72	<?php the_content(); ?>
73		-<?php else : ?>
	73	+<?php else {
	74	+ : ?>
74	75	<?php
75	76	$images = twentyten_get_gallery_images();
	77	+}
76	78	if ( $images ) :
77	79	$total_images = count( $images );
78	80	$image = reset( $images );
		@@ -111,9 +113,12 @@ discard block
		block discarded – undo
111	113	<div class="entry-summary">
112	114	<?php the_excerpt(); ?>
113	115	</div><!-- .entry-summary -->
114		- <?php else : ?>
	116	+ <?php else {
	117	+ : ?>
115	118	<div class="entry-content">
116		- <?php the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyten' ) ); ?>
	119	+ <?php the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyten' ) );
	120	+}
	121	+?>
117	122	</div><!-- .entry-content -->
118	123	<?php endif; ?>
119	124
		@@ -127,8 +132,11 @@ discard block
		block discarded – undo
127	132
128	133	<?php /* How to display all other posts. */ ?>
129	134
130		- <?php else : ?>
131		- <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
	135	+ <?php else {
	136	+ : ?>
	137	+ <div id="post-<?php the_ID();
	138	+}
	139	+?>" <?php post_class(); ?>>
132	140	<h2 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
133	141
134	142	<div class="entry-meta">
		@@ -139,9 +147,12 @@ discard block
		block discarded – undo
139	147	<div class="entry-summary">
140	148	<?php the_excerpt(); ?>
141	149	</div><!-- .entry-summary -->
142		- <?php else : ?>
	150	+ <?php else {
	151	+ : ?>
143	152	<div class="entry-content">
144		- <?php the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyten' ) ); ?>
	153	+ <?php the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyten' ) );
	154	+}
	155	+?>
145	156	<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
146	157	</div><!-- .entry-content -->
147	158	<?php endif; ?>

		@@ -13,9 +13,9 @@
		block discarded – undo
13	13	<div id="content" role="main">
14	14
15	15	<div id="post-0" class="post error404 not-found">
16		- <h1 class="entry-title"><?php _e( 'Not Found', 'twentyten' ); ?></h1>
	16	+ <h1 class="entry-title"><?php _e('Not Found', 'twentyten'); ?></h1>
17	17	<div class="entry-content">
18		- <p><?php _e( 'Apologies, but the page you requested could not be found. Perhaps searching will help.', 'twentyten' ); ?></p>
	18	+ <p><?php _e('Apologies, but the page you requested could not be found. Perhaps searching will help.', 'twentyten'); ?></p>
19	19	<?php get_search_form(); ?>
20	20	</div><!-- .entry-content -->
21	21	</div><!-- #post-0 -->

		@@ -14,8 +14,8 @@ discard block
		block discarded – undo
14	14	?>
15	15
16	16	<div id="comments">
17		-<?php if ( post_password_required() ) : ?>
18		- <p class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'twentyten' ); ?></p>
	17	+<?php if (post_password_required()) : ?>
	18	+ <p class="nopassword"><?php _e('This post is password protected. Enter the password to view any comments.', 'twentyten'); ?></p>
19	19	</div><!-- #comments -->
20	20	<?php
21	21	/*
		@@ -31,16 +31,16 @@ discard block
		block discarded – undo
31	31	// You can start editing here -- including this comment!
32	32	?>
33	33
34		-<?php if ( have_comments() ) : ?>
	34	+<?php if (have_comments()) : ?>
35	35	<h3 id="comments-title"><?php
36		- printf( _n( 'One Response to %2$s', '%1$s Responses to %2$s', get_comments_number(), 'twentyten' ),
37		- number_format_i18n( get_comments_number() ), '<em>' . get_the_title() . '</em>' );
	36	+ printf(_n('One Response to %2$s', '%1$s Responses to %2$s', get_comments_number(), 'twentyten'),
	37	+ number_format_i18n(get_comments_number()), '<em>'.get_the_title().'</em>');
38	38	?></h3>
39	39
40		-<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
	40	+<?php if (get_comment_pages_count() > 1 && get_option('page_comments')) : // Are there comments to navigate through? ?>
41	41	<div class="navigation">
42		- <div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">←</span> Older Comments', 'twentyten' ) ); ?></div>
43		- <div class="nav-next"><?php next_comments_link( __( 'Newer Comments <span class="meta-nav">→</span>', 'twentyten' ) ); ?></div>
	42	+ <div class="nav-previous"><?php previous_comments_link(__('<span class="meta-nav">←</span> Older Comments', 'twentyten')); ?></div>
	43	+ <div class="nav-next"><?php next_comments_link(__('Newer Comments <span class="meta-nav">→</span>', 'twentyten')); ?></div>
44	44	</div> <!-- .navigation -->
45	45	<?php endif; // check for comment navigation ?>
46	46
		@@ -53,14 +53,14 @@ discard block
		block discarded – undo
53	53	* define twentyten_comment() and that will be used instead.
54	54	* See twentyten_comment() in twentyten/functions.php for more.
55	55	*/
56		- wp_list_comments( array( 'callback' => 'twentyten_comment' ) );
	56	+ wp_list_comments(array('callback' => 'twentyten_comment'));
57	57	?>
58	58	</ol>
59	59
60		-<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
	60	+<?php if (get_comment_pages_count() > 1 && get_option('page_comments')) : // Are there comments to navigate through? ?>
61	61	<div class="navigation">
62		- <div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">←</span> Older Comments', 'twentyten' ) ); ?></div>
63		- <div class="nav-next"><?php next_comments_link( __( 'Newer Comments <span class="meta-nav">→</span>', 'twentyten' ) ); ?></div>
	62	+ <div class="nav-previous"><?php previous_comments_link(__('<span class="meta-nav">←</span> Older Comments', 'twentyten')); ?></div>
	63	+ <div class="nav-next"><?php next_comments_link(__('Newer Comments <span class="meta-nav">→</span>', 'twentyten')); ?></div>
64	64	</div><!-- .navigation -->
65	65	<?php endif; // check for comment navigation ?>
66	66
		@@ -69,9 +69,9 @@ discard block
		block discarded – undo
69	69	* If there are no comments and comments are closed, let's leave a little note, shall we?
70	70	* But we only want the note on posts and pages that had comments in the first place.
71	71	*/
72		- if ( ! comments_open() && get_comments_number() ) : ?>
73		- <p class="nocomments"><?php _e( 'Comments are closed.' , 'twentyten' ); ?></p>
74		- <?php endif; ?>
	72	+ if ( ! comments_open() && get_comments_number()) : ?>
	73	+ <p class="nocomments"><?php _e('Comments are closed.', 'twentyten'); ?></p>
	74	+ <?php endif; ?>
75	75
76	76	<?php endif; // end have_comments() ?>
77	77

		@@ -14,11 +14,11 @@
		block discarded – undo
14	14
15	15	<footer id="colophon" class="site-footer" role="contentinfo">
16	16
17		- <?php get_sidebar( 'footer' ); ?>
	17	+ <?php get_sidebar('footer'); ?>
18	18
19	19	<div class="site-info">
20		- <?php do_action( 'twentyfourteen_credits' ); ?>
21		- <a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyfourteen' ) ); ?>"><?php printf( __( 'Proudly powered by %s', 'twentyfourteen' ), 'WordPress' ); ?></a>
	20	+ <?php do_action('twentyfourteen_credits'); ?>
	21	+ <a href="<?php echo esc_url(__('https://wordpress.org/', 'twentyfourteen')); ?>"><?php printf(__('Proudly powered by %s', 'twentyfourteen'), 'WordPress'); ?></a>
22	22	</div><!-- .site-info -->
23	23	</footer><!-- #colophon -->
24	24	</div><!-- #page -->

		@@ -12,51 +12,51 @@
		block discarded – undo
12	12	<?php twentyfourteen_post_thumbnail(); ?>
13	13
14	14	<header class="entry-header">
15		- <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
	15	+ <?php if (in_array('category', get_object_taxonomies(get_post_type())) && twentyfourteen_categorized_blog()) : ?>
16	16	<div class="entry-meta">
17		- <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
	17	+ <span class="cat-links"><?php echo get_the_category_list(_x(', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen')); ?></span>
18	18	</div><!-- .entry-meta -->
19	19	<?php
20	20	endif;
21	21
22		- if ( is_single() ) :
23		- the_title( '<h1 class="entry-title">', '</h1>' );
	22	+ if (is_single()) :
	23	+ the_title('<h1 class="entry-title">', '</h1>');
24	24	else :
25		- the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
	25	+ the_title('<h1 class="entry-title"><a href="'.esc_url(get_permalink()).'" rel="bookmark">', '</a></h1>');
26	26	endif;
27	27	?>
28	28
29	29	<div class="entry-meta">
30	30	<span class="post-format">
31		- <a class="entry-format" href="<?php echo esc_url( get_post_format_link( 'quote' ) ); ?>"><?php echo get_post_format_string( 'quote' ); ?></a>
	31	+ <a class="entry-format" href="<?php echo esc_url(get_post_format_link('quote')); ?>"><?php echo get_post_format_string('quote'); ?></a>
32	32	</span>
33	33
34	34	<?php twentyfourteen_posted_on(); ?>
35	35
36		- <?php if ( ! post_password_required() && ( comments_open() \|\| get_comments_number() ) ) : ?>
37		- <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
	36	+ <?php if ( ! post_password_required() && (comments_open() \|\| get_comments_number())) : ?>
	37	+ <span class="comments-link"><?php comments_popup_link(__('Leave a comment', 'twentyfourteen'), __('1 Comment', 'twentyfourteen'), __('% Comments', 'twentyfourteen')); ?></span>
38	38	<?php endif; ?>
39	39
40		- <?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>
	40	+ <?php edit_post_link(__('Edit', 'twentyfourteen'), '<span class="edit-link">', '</span>'); ?>
41	41	</div><!-- .entry-meta -->
42	42	</header><!-- .entry-header -->
43	43
44	44	<div class="entry-content">
45	45	<?php
46	46	/* translators: %s: Name of current post */
47		- the_content( sprintf(
48		- __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentyfourteen' ),
49		- the_title( '<span class="screen-reader-text">', '</span>', false )
50		- ) );
	47	+ the_content(sprintf(
	48	+ __('Continue reading %s <span class="meta-nav">→</span>', 'twentyfourteen'),
	49	+ the_title('<span class="screen-reader-text">', '</span>', false)
	50	+ ));
51	51
52		- wp_link_pages( array(
53		- 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
	52	+ wp_link_pages(array(
	53	+ 'before' => '<div class="page-links"><span class="page-links-title">'.__('Pages:', 'twentyfourteen').'</span>',
54	54	'after' => '</div>',
55	55	'link_before' => '<span>',
56	56	'link_after' => '</span>',
57		- ) );
	57	+ ));
58	58	?>
59	59	</div><!-- .entry-content -->
60	60
61		- <?php the_tags( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' ); ?>
	61	+ <?php the_tags('<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>'); ?>
62	62	</article><!-- #post-## -->

		@@ -21,8 +21,10 @@
		block discarded – undo
21	21
22	22	if ( is_single() ) :
23	23	the_title( '<h1 class="entry-title">', '</h1>' );
24		- else :
	24	+ else {
	25	+ :
25	26	the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
	27	+ }
26	28	endif;
27	29	?>
28	30

		@@ -18,20 +18,20 @@ discard block
		block discarded – undo
18	18
19	19	<?php
20	20	// Start the Loop.
21		- while ( have_posts() ) : the_post();
	21	+ while (have_posts()) : the_post();
22	22	?>
23	23	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
24	24	<header class="entry-header">
25		- <?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
	25	+ <?php the_title('<h1 class="entry-title">', '</h1>'); ?>
26	26
27	27	<div class="entry-meta">
28	28
29		- <span class="entry-date"><time class="entry-date" datetime="<?php echo esc_attr( get_the_date( 'c' ) ); ?>"><?php echo esc_html( get_the_date() ); ?></time></span>
	29	+ <span class="entry-date"><time class="entry-date" datetime="<?php echo esc_attr(get_the_date('c')); ?>"><?php echo esc_html(get_the_date()); ?></time></span>
30	30
31		- <span class="full-size-link"><a href="<?php echo esc_url( wp_get_attachment_url() ); ?>"><?php echo esc_html( $metadata['width'] ); ?> × <?php echo esc_html( $metadata['height'] ); ?></a></span>
	31	+ <span class="full-size-link"><a href="<?php echo esc_url(wp_get_attachment_url()); ?>"><?php echo esc_html($metadata['width']); ?> × <?php echo esc_html($metadata['height']); ?></a></span>
32	32
33		- <span class="parent-post-link"><a href="<?php echo esc_url( get_permalink( $post->post_parent ) ); ?>" rel="gallery"><?php echo get_the_title( $post->post_parent ); ?></a></span>
34		- <?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>
	33	+ <span class="parent-post-link"><a href="<?php echo esc_url(get_permalink($post->post_parent)); ?>" rel="gallery"><?php echo get_the_title($post->post_parent); ?></a></span>
	34	+ <?php edit_post_link(__('Edit', 'twentyfourteen'), '<span class="edit-link">', '</span>'); ?>
35	35	</div><!-- .entry-meta -->
36	36	</header><!-- .entry-header -->
37	37
		@@ -41,7 +41,7 @@ discard block
		block discarded – undo
41	41	<?php twentyfourteen_the_attached_image(); ?>
42	42	</div><!-- .attachment -->
43	43
44		- <?php if ( has_excerpt() ) : ?>
	44	+ <?php if (has_excerpt()) : ?>
45	45	<div class="entry-caption">
46	46	<?php the_excerpt(); ?>
47	47	</div><!-- .entry-caption -->
		@@ -50,20 +50,20 @@ discard block
		block discarded – undo
50	50
51	51	<?php
52	52	the_content();
53		- wp_link_pages( array(
54		- 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
	53	+ wp_link_pages(array(
	54	+ 'before' => '<div class="page-links"><span class="page-links-title">'.__('Pages:', 'twentyfourteen').'</span>',
55	55	'after' => '</div>',
56	56	'link_before' => '<span>',
57	57	'link_after' => '</span>',
58		- ) );
	58	+ ));
59	59	?>
60	60	</div><!-- .entry-content -->
61	61	</article><!-- #post-## -->
62	62
63	63	<nav id="image-navigation" class="navigation image-navigation">
64	64	<div class="nav-links">
65		- <?php previous_image_link( false, '<div class="previous-image">' . __( 'Previous Image', 'twentyfourteen' ) . '</div>' ); ?>
66		- <?php next_image_link( false, '<div class="next-image">' . __( 'Next Image', 'twentyfourteen' ) . '</div>' ); ?>
	65	+ <?php previous_image_link(false, '<div class="previous-image">'.__('Previous Image', 'twentyfourteen').'</div>'); ?>
	66	+ <?php next_image_link(false, '<div class="next-image">'.__('Next Image', 'twentyfourteen').'</div>'); ?>
67	67	</div><!-- .nav-links -->
68	68	</nav><!-- #image-navigation -->
69	69

		@@ -19,11 +19,11 @@ discard block
		block discarded – undo
19	19	<html <?php language_attributes(); ?>>
20	20	<!--<![endif]-->
21	21	<head>
22		- <meta charset="<?php bloginfo( 'charset' ); ?>">
	22	+ <meta charset="<?php bloginfo('charset'); ?>">
23	23	<meta name="viewport" content="width=device-width">
24		- <title><?php wp_title( '\|', true, 'right' ); ?></title>
	24	+ <title><?php wp_title('\|', true, 'right'); ?></title>
25	25	<link rel="profile" href="http://gmpg.org/xfn/11">
26		- <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>">
	26	+ <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>">
27	27	<!--[if lt IE 9]>
28	28	<script src="<?php echo get_template_directory_uri(); ?>/js/html5.js"></script>
29	29	<![endif]-->
		@@ -32,26 +32,26 @@ discard block
		block discarded – undo
32	32
33	33	<body <?php body_class(); ?>>
34	34	<div id="page" class="hfeed site">
35		- <?php if ( get_header_image() ) : ?>
	35	+ <?php if (get_header_image()) : ?>
36	36	<div id="site-header">
37		- <a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home">
38		- <img src="<?php header_image(); ?>" width="<?php echo get_custom_header()->width; ?>" height="<?php echo get_custom_header()->height; ?>" alt="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>">
	37	+ <a href="<?php echo esc_url(home_url('/')); ?>" rel="home">
	38	+ <img src="<?php header_image(); ?>" width="<?php echo get_custom_header()->width; ?>" height="<?php echo get_custom_header()->height; ?>" alt="<?php echo esc_attr(get_bloginfo('name', 'display')); ?>">
39	39	</a>
40	40	</div>
41	41	<?php endif; ?>
42	42
43	43	<header id="masthead" class="site-header" role="banner">
44	44	<div class="header-main">
45		- <h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
	45	+ <h1 class="site-title"><a href="<?php echo esc_url(home_url('/')); ?>" rel="home"><?php bloginfo('name'); ?></a></h1>
46	46
47	47	<div class="search-toggle">
48		- <a href="#search-container" class="screen-reader-text" aria-expanded="false" aria-controls="search-container"><?php _e( 'Search', 'twentyfourteen' ); ?></a>
	48	+ <a href="#search-container" class="screen-reader-text" aria-expanded="false" aria-controls="search-container"><?php _e('Search', 'twentyfourteen'); ?></a>
49	49	</div>
50	50
51	51	<nav id="primary-navigation" class="site-navigation primary-navigation" role="navigation">
52		- <button class="menu-toggle"><?php _e( 'Primary Menu', 'twentyfourteen' ); ?></button>
53		- <a class="screen-reader-text skip-link" href="#content"><?php _e( 'Skip to content', 'twentyfourteen' ); ?></a>
54		- <?php wp_nav_menu( array( 'theme_location' => 'primary', 'menu_class' => 'nav-menu', 'menu_id' => 'primary-menu' ) ); ?>
	52	+ <button class="menu-toggle"><?php _e('Primary Menu', 'twentyfourteen'); ?></button>
	53	+ <a class="screen-reader-text skip-link" href="#content"><?php _e('Skip to content', 'twentyfourteen'); ?></a>
	54	+ <?php wp_nav_menu(array('theme_location' => 'primary', 'menu_class' => 'nav-menu', 'menu_id' => 'primary-menu')); ?>
55	55	</nav>
56	56	</div>
57	57

ntwb / wordpress

Push — master ( d99bf9...491baf )

Category

Spacing +41 added lines, -41 removed lines patch added patch discarded remove patch

Braces +18 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch