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 +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -11,11 +11,11 @@
 block discarded – undo
  * @since Twenty Thirteen 1.0
  */
 
-if ( is_active_sidebar( 'sidebar-2' ) ) : ?>
+if (is_active_sidebar('sidebar-2')) : ?>
 	<div id="tertiary" class="sidebar-container" role="complementary">
 		<div class="sidebar-inner">
 			<div class="widget-area">
-				<?php dynamic_sidebar( 'sidebar-2' ); ?>
+				<?php dynamic_sidebar('sidebar-2'); ?>
 			</div><!-- .widget-area -->
 		</div><!-- .sidebar-inner -->
 	</div><!-- #tertiary -->

Please login to merge, or discard this patch.

src/wp-content/themes/twentythirteen/index.php 2 patches

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

@@ -18,17 +18,17 @@
 block discarded – undo
 
 	<div id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
-		<?php if ( have_posts() ) : ?>
+		<?php if (have_posts()) : ?>
 
 			<?php /* The loop */ ?>
-			<?php while ( have_posts() ) : the_post(); ?>
-				<?php get_template_part( 'content', get_post_format() ); ?>
+			<?php while (have_posts()) : the_post(); ?>
+				<?php get_template_part('content', get_post_format()); ?>
 			<?php endwhile; ?>
 
 			<?php twentythirteen_paging_nav(); ?>
 
 		<?php else : ?>
-			<?php get_template_part( 'content', 'none' ); ?>
+			<?php get_template_part('content', 'none'); ?>
 		<?php endif; ?>
 
 		</div><!-- #content -->

Please login to merge, or discard this patch.

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

@@ -27,8 +27,11 @@
 block discarded – undo
 
 			<?php twentythirteen_paging_nav(); ?>
 
-		<?php else : ?>
-			<?php get_template_part( 'content', 'none' ); ?>
+		<?php else {
+	: ?>
+			<?php get_template_part( 'content', 'none' );
+}
+?>
 		<?php endif; ?>
 
 		</div><!-- #content -->

Please login to merge, or discard this patch.

src/wp-content/themes/twentythirteen/content-video.php 2 patches

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

@@ -10,7 +10,7 @@  discard block
 block discarded – undo
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="entry-header">
-		<?php if ( is_single() ) : ?>
+		<?php if (is_single()) : ?>
 		<h1 class="entry-title"><?php the_title(); ?></h1>
 		<?php else : ?>
 		<h1 class="entry-title">
@@ -22,27 +22,27 @@  discard block
 block discarded – undo
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(sprintf(
+				__('Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen'),
+				the_title('<span class="screen-reader-text">', '</span>', false)
+			));
 
-			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+			wp_link_pages(array('before' => '<div class="page-links"><span class="page-links-title">'.__('Pages:', 'twentythirteen').'</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>'));
 		?>
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
 		<?php twentythirteen_entry_meta(); ?>
 
-		<?php if ( comments_open() && ! is_single() ) : ?>
+		<?php if (comments_open() && ! is_single()) : ?>
 		<span class="comments-link">
-			<?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a comment', 'twentythirteen' ) . '</span>', __( 'One comment so far', 'twentythirteen' ), __( 'View all % comments', 'twentythirteen' ) ); ?>
+			<?php comments_popup_link('<span class="leave-reply">'.__('Leave a comment', 'twentythirteen').'</span>', __('One comment so far', 'twentythirteen'), __('View all % comments', 'twentythirteen')); ?>
 		</span><!-- .comments-link -->
 		<?php endif; // comments_open() ?>
-		<?php edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' ); ?>
+		<?php edit_post_link(__('Edit', 'twentythirteen'), '<span class="edit-link">', '</span>'); ?>
 
-		<?php if ( is_single() && get_the_author_meta( 'description' ) && is_multi_author() ) : ?>
-			<?php get_template_part( 'author-bio' ); ?>
+		<?php if (is_single() && get_the_author_meta('description') && is_multi_author()) : ?>
+			<?php get_template_part('author-bio'); ?>
 		<?php endif; ?>
 	</footer><!-- .entry-meta -->
 </article><!-- #post -->

Please login to merge, or discard this patch.

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

@@ -12,9 +12,12 @@
 block discarded – undo
 	<header class="entry-header">
 		<?php if ( is_single() ) : ?>
 		<h1 class="entry-title"><?php the_title(); ?></h1>
-		<?php else : ?>
+		<?php else {
+	: ?>
 		<h1 class="entry-title">
-			<a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a>
+			<a href="<?php the_permalink();
+}
+?>" rel="bookmark"><?php the_title(); ?></a>
 		</h1>
 		<?php endif; // is_single() ?>
 	</header><!-- .entry-header -->

Please login to merge, or discard this patch.

src/wp-content/themes/twentythirteen/content-aside.php 2 patches

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

@@ -12,27 +12,27 @@
 block discarded – undo
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(sprintf(
+				__('Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen'),
+				the_title('<span class="screen-reader-text">', '</span>', false)
+			));
 
-			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+			wp_link_pages(array('before' => '<div class="page-links"><span class="page-links-title">'.__('Pages:', 'twentythirteen').'</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>'));
 		?>
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
-		<?php if ( is_single() ) : ?>
+		<?php if (is_single()) : ?>
 			<?php twentythirteen_entry_meta(); ?>
-			<?php edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' ); ?>
+			<?php edit_post_link(__('Edit', 'twentythirteen'), '<span class="edit-link">', '</span>'); ?>
 
-			<?php if ( get_the_author_meta( 'description' ) && is_multi_author() ) : ?>
-				<?php get_template_part( 'author-bio' ); ?>
+			<?php if (get_the_author_meta('description') && is_multi_author()) : ?>
+				<?php get_template_part('author-bio'); ?>
 			<?php endif; ?>
 
 		<?php else : ?>
 			<?php twentythirteen_entry_date(); ?>
-			<?php edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' ); ?>
+			<?php edit_post_link(__('Edit', 'twentythirteen'), '<span class="edit-link">', '</span>'); ?>
 		<?php endif; // is_single() ?>
 	</footer><!-- .entry-meta -->
 </article><!-- #post -->

Please login to merge, or discard this patch.

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

@@ -30,8 +30,11 @@
 block discarded – undo
 				<?php get_template_part( 'author-bio' ); ?>
 			<?php endif; ?>
 
-		<?php else : ?>
-			<?php twentythirteen_entry_date(); ?>
+		<?php else {
+	: ?>
+			<?php twentythirteen_entry_date();
+}
+?>
 			<?php edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' ); ?>
 		<?php endif; // is_single() ?>
 	</footer><!-- .entry-meta -->

Please login to merge, or discard this patch.

src/wp-content/themes/twentythirteen/category.php 2 patches

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

@@ -14,24 +14,24 @@
 block discarded – undo
 	<div id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
 
-		<?php if ( have_posts() ) : ?>
+		<?php if (have_posts()) : ?>
 			<header class="archive-header">
-				<h1 class="archive-title"><?php printf( __( 'Category Archives: %s', 'twentythirteen' ), single_cat_title( '', false ) ); ?></h1>
+				<h1 class="archive-title"><?php printf(__('Category Archives: %s', 'twentythirteen'), single_cat_title('', false)); ?></h1>
 
-				<?php if ( category_description() ) : // Show an optional category description ?>
+				<?php if (category_description()) : // Show an optional category description ?>
 				<div class="archive-meta"><?php echo category_description(); ?></div>
 				<?php endif; ?>
 			</header><!-- .archive-header -->
 
 			<?php /* The loop */ ?>
-			<?php while ( have_posts() ) : the_post(); ?>
-				<?php get_template_part( 'content', get_post_format() ); ?>
+			<?php while (have_posts()) : the_post(); ?>
+				<?php get_template_part('content', get_post_format()); ?>
 			<?php endwhile; ?>
 
 			<?php twentythirteen_paging_nav(); ?>
 
 		<?php else : ?>
-			<?php get_template_part( 'content', 'none' ); ?>
+			<?php get_template_part('content', 'none'); ?>
 		<?php endif; ?>
 
 		</div><!-- #content -->

Please login to merge, or discard this patch.

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

@@ -27,8 +27,11 @@
 block discarded – undo
 
 			<?php twentythirteen_paging_nav(); ?>
 
-		<?php else : ?>
-			<?php get_template_part( 'content', 'none' ); ?>
+		<?php else {
+	: ?>
+			<?php get_template_part( 'content', 'none' );
+}
+?>
 		<?php endif; ?>
 
 		</div><!-- #content -->

Please login to merge, or discard this patch.

src/wp-content/themes/twentythirteen/content-link.php 1 patch

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

@@ -11,32 +11,32 @@
 block discarded – undo
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="entry-header">
 		<h1 class="entry-title">
-			<a href="<?php echo esc_url( twentythirteen_get_link_url() ); ?>"><?php the_title(); ?></a>
+			<a href="<?php echo esc_url(twentythirteen_get_link_url()); ?>"><?php the_title(); ?></a>
 		</h1>
 
 		<div class="entry-meta">
 			<?php twentythirteen_entry_date(); ?>
-			<?php edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' ); ?>
+			<?php edit_post_link(__('Edit', 'twentythirteen'), '<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>', 'twentythirteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(sprintf(
+				__('Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen'),
+				the_title('<span class="screen-reader-text">', '</span>', false)
+			));
 
-			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+			wp_link_pages(array('before' => '<div class="page-links"><span class="page-links-title">'.__('Pages:', 'twentythirteen').'</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>'));
 		?>
 	</div><!-- .entry-content -->
 
-	<?php if ( is_single() ) : ?>
+	<?php if (is_single()) : ?>
 	<footer class="entry-meta">
 		<?php twentythirteen_entry_meta(); ?>
-		<?php if ( get_the_author_meta( 'description' ) && is_multi_author() ) : ?>
-			<?php get_template_part( 'author-bio' ); ?>
+		<?php if (get_the_author_meta('description') && is_multi_author()) : ?>
+			<?php get_template_part('author-bio'); ?>
 		<?php endif; ?>
 	</footer><!-- .entry-meta -->
 	<?php endif; // is_single() ?>

Please login to merge, or discard this patch.

src/wp-content/themes/twentythirteen/page.php 1 patch

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

@@ -17,11 +17,11 @@  discard block
 block discarded – undo
 		<div id="content" class="site-content" role="main">
 
 			<?php /* The loop */ ?>
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php while (have_posts()) : the_post(); ?>
 
 				<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 					<header class="entry-header">
-						<?php if ( has_post_thumbnail() && ! post_password_required() ) : ?>
+						<?php if (has_post_thumbnail() && ! post_password_required()) : ?>
 						<div class="entry-thumbnail">
 							<?php the_post_thumbnail(); ?>
 						</div>
@@ -32,11 +32,11 @@  discard block
 block discarded – undo
 
 					<div class="entry-content">
 						<?php the_content(); ?>
-						<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
+						<?php wp_link_pages(array('before' => '<div class="page-links"><span class="page-links-title">'.__('Pages:', 'twentythirteen').'</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>')); ?>
 					</div><!-- .entry-content -->
 
 					<footer class="entry-meta">
-						<?php edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' ); ?>
+						<?php edit_post_link(__('Edit', 'twentythirteen'), '<span class="edit-link">', '</span>'); ?>
 					</footer><!-- .entry-meta -->
 				</article><!-- #post -->
 

Please login to merge, or discard this patch.

src/wp-content/themes/twentythirteen/search.php 2 patches

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

@@ -12,21 +12,21 @@
 block discarded – undo
 	<div id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
 
-		<?php if ( have_posts() ) : ?>
+		<?php if (have_posts()) : ?>
 
 			<header class="page-header">
-				<h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'twentythirteen' ), get_search_query() ); ?></h1>
+				<h1 class="page-title"><?php printf(__('Search Results for: %s', 'twentythirteen'), get_search_query()); ?></h1>
 			</header>
 
 			<?php /* The loop */ ?>
-			<?php while ( have_posts() ) : the_post(); ?>
-				<?php get_template_part( 'content', get_post_format() ); ?>
+			<?php while (have_posts()) : the_post(); ?>
+				<?php get_template_part('content', get_post_format()); ?>
 			<?php endwhile; ?>
 
 			<?php twentythirteen_paging_nav(); ?>
 
 		<?php else : ?>
-			<?php get_template_part( 'content', 'none' ); ?>
+			<?php get_template_part('content', 'none'); ?>
 		<?php endif; ?>
 
 		</div><!-- #content -->

Please login to merge, or discard this patch.

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

@@ -27,8 +27,11 @@
 block discarded – undo
 
 			<?php twentythirteen_paging_nav(); ?>
 
-		<?php else : ?>
-			<?php get_template_part( 'content', 'none' ); ?>
+		<?php else {
+	: ?>
+			<?php get_template_part( 'content', 'none' );
+}
+?>
 		<?php endif; ?>
 
 		</div><!-- #content -->

Please login to merge, or discard this patch.

src/wp-content/themes/twentythirteen/taxonomy-post_format.php 2 patches

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

@@ -18,20 +18,20 @@
 block discarded – undo
 	<div id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
 
-		<?php if ( have_posts() ) : ?>
+		<?php if (have_posts()) : ?>
 			<header class="archive-header">
-				<h1 class="archive-title"><?php printf( __( '%s Archives', 'twentythirteen' ), '<span>' . esc_html( get_post_format_string( get_post_format() ) ) . '</span>' ); ?></h1>
+				<h1 class="archive-title"><?php printf(__('%s Archives', 'twentythirteen'), '<span>'.esc_html(get_post_format_string(get_post_format())).'</span>'); ?></h1>
 			</header><!-- .archive-header -->
 
 			<?php /* The loop */ ?>
-			<?php while ( have_posts() ) : the_post(); ?>
-				<?php get_template_part( 'content', get_post_format() ); ?>
+			<?php while (have_posts()) : the_post(); ?>
+				<?php get_template_part('content', get_post_format()); ?>
 			<?php endwhile; ?>
 
 			<?php twentythirteen_paging_nav(); ?>
 
 		<?php else : ?>
-			<?php get_template_part( 'content', 'none' ); ?>
+			<?php get_template_part('content', 'none'); ?>
 		<?php endif; ?>
 
 		</div><!-- #content -->

Please login to merge, or discard this patch.

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

@@ -27,8 +27,11 @@
 block discarded – undo
 
 			<?php twentythirteen_paging_nav(); ?>
 
-		<?php else : ?>
-			<?php get_template_part( 'content', 'none' ); ?>
+		<?php else {
+	: ?>
+			<?php get_template_part( 'content', 'none' );
+}
+?>
 		<?php endif; ?>
 
 		</div><!-- #content -->

Please login to merge, or discard this patch.

		@@ -11,11 +11,11 @@
		block discarded – undo
11	11	* @since Twenty Thirteen 1.0
12	12	*/
13	13
14		-if ( is_active_sidebar( 'sidebar-2' ) ) : ?>
	14	+if (is_active_sidebar('sidebar-2')) : ?>
15	15	<div id="tertiary" class="sidebar-container" role="complementary">
16	16	<div class="sidebar-inner">
17	17	<div class="widget-area">
18		- <?php dynamic_sidebar( 'sidebar-2' ); ?>
	18	+ <?php dynamic_sidebar('sidebar-2'); ?>
19	19	</div><!-- .widget-area -->
20	20	</div><!-- .sidebar-inner -->
21	21	</div><!-- #tertiary -->

		@@ -18,17 +18,17 @@
		block discarded – undo
18	18
19	19	<div id="primary" class="content-area">
20	20	<div id="content" class="site-content" role="main">
21		- <?php if ( have_posts() ) : ?>
	21	+ <?php if (have_posts()) : ?>
22	22
23	23	<?php /* The loop */ ?>
24		- <?php while ( have_posts() ) : the_post(); ?>
25		- <?php get_template_part( 'content', get_post_format() ); ?>
	24	+ <?php while (have_posts()) : the_post(); ?>
	25	+ <?php get_template_part('content', get_post_format()); ?>
26	26	<?php endwhile; ?>
27	27
28	28	<?php twentythirteen_paging_nav(); ?>
29	29
30	30	<?php else : ?>
31		- <?php get_template_part( 'content', 'none' ); ?>
	31	+ <?php get_template_part('content', 'none'); ?>
32	32	<?php endif; ?>
33	33
34	34	</div><!-- #content -->

		@@ -27,8 +27,11 @@
		block discarded – undo
27	27
28	28	<?php twentythirteen_paging_nav(); ?>
29	29
30		- <?php else : ?>
31		- <?php get_template_part( 'content', 'none' ); ?>
	30	+ <?php else {
	31	+ : ?>
	32	+ <?php get_template_part( 'content', 'none' );
	33	+}
	34	+?>
32	35	<?php endif; ?>
33	36
34	37	</div><!-- #content -->

		@@ -10,7 +10,7 @@ discard block
		block discarded – undo
10	10
11	11	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
12	12	<header class="entry-header">
13		- <?php if ( is_single() ) : ?>
	13	+ <?php if (is_single()) : ?>
14	14	<h1 class="entry-title"><?php the_title(); ?></h1>
15	15	<?php else : ?>
16	16	<h1 class="entry-title">
		@@ -22,27 +22,27 @@ discard block
		block discarded – undo
22	22	<div class="entry-content">
23	23	<?php
24	24	/* translators: %s: Name of current post */
25		- the_content( sprintf(
26		- __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen' ),
27		- the_title( '<span class="screen-reader-text">', '</span>', false )
28		- ) );
	25	+ the_content(sprintf(
	26	+ __('Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen'),
	27	+ the_title('<span class="screen-reader-text">', '</span>', false)
	28	+ ));
29	29
30		- wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
	30	+ wp_link_pages(array('before' => '<div class="page-links"><span class="page-links-title">'.__('Pages:', 'twentythirteen').'</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>'));
31	31	?>
32	32	</div><!-- .entry-content -->
33	33
34	34	<footer class="entry-meta">
35	35	<?php twentythirteen_entry_meta(); ?>
36	36
37		- <?php if ( comments_open() && ! is_single() ) : ?>
	37	+ <?php if (comments_open() && ! is_single()) : ?>
38	38	<span class="comments-link">
39		- <?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a comment', 'twentythirteen' ) . '</span>', __( 'One comment so far', 'twentythirteen' ), __( 'View all % comments', 'twentythirteen' ) ); ?>
	39	+ <?php comments_popup_link('<span class="leave-reply">'.__('Leave a comment', 'twentythirteen').'</span>', __('One comment so far', 'twentythirteen'), __('View all % comments', 'twentythirteen')); ?>
40	40	</span><!-- .comments-link -->
41	41	<?php endif; // comments_open() ?>
42		- <?php edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' ); ?>
	42	+ <?php edit_post_link(__('Edit', 'twentythirteen'), '<span class="edit-link">', '</span>'); ?>
43	43
44		- <?php if ( is_single() && get_the_author_meta( 'description' ) && is_multi_author() ) : ?>
45		- <?php get_template_part( 'author-bio' ); ?>
	44	+ <?php if (is_single() && get_the_author_meta('description') && is_multi_author()) : ?>
	45	+ <?php get_template_part('author-bio'); ?>
46	46	<?php endif; ?>
47	47	</footer><!-- .entry-meta -->
48	48	</article><!-- #post -->

		@@ -12,9 +12,12 @@
		block discarded – undo
12	12	<header class="entry-header">
13	13	<?php if ( is_single() ) : ?>
14	14	<h1 class="entry-title"><?php the_title(); ?></h1>
15		- <?php else : ?>
	15	+ <?php else {
	16	+ : ?>
16	17	<h1 class="entry-title">
17		- <a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a>
	18	+ <a href="<?php the_permalink();
	19	+}
	20	+?>" rel="bookmark"><?php the_title(); ?></a>
18	21	</h1>
19	22	<?php endif; // is_single() ?>
20	23	</header><!-- .entry-header -->

		@@ -12,27 +12,27 @@
		block discarded – undo
12	12	<div class="entry-content">
13	13	<?php
14	14	/* translators: %s: Name of current post */
15		- the_content( sprintf(
16		- __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen' ),
17		- the_title( '<span class="screen-reader-text">', '</span>', false )
18		- ) );
	15	+ the_content(sprintf(
	16	+ __('Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen'),
	17	+ the_title('<span class="screen-reader-text">', '</span>', false)
	18	+ ));
19	19
20		- wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
	20	+ wp_link_pages(array('before' => '<div class="page-links"><span class="page-links-title">'.__('Pages:', 'twentythirteen').'</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>'));
21	21	?>
22	22	</div><!-- .entry-content -->
23	23
24	24	<footer class="entry-meta">
25		- <?php if ( is_single() ) : ?>
	25	+ <?php if (is_single()) : ?>
26	26	<?php twentythirteen_entry_meta(); ?>
27		- <?php edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' ); ?>
	27	+ <?php edit_post_link(__('Edit', 'twentythirteen'), '<span class="edit-link">', '</span>'); ?>
28	28
29		- <?php if ( get_the_author_meta( 'description' ) && is_multi_author() ) : ?>
30		- <?php get_template_part( 'author-bio' ); ?>
	29	+ <?php if (get_the_author_meta('description') && is_multi_author()) : ?>
	30	+ <?php get_template_part('author-bio'); ?>
31	31	<?php endif; ?>
32	32
33	33	<?php else : ?>
34	34	<?php twentythirteen_entry_date(); ?>
35		- <?php edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' ); ?>
	35	+ <?php edit_post_link(__('Edit', 'twentythirteen'), '<span class="edit-link">', '</span>'); ?>
36	36	<?php endif; // is_single() ?>
37	37	</footer><!-- .entry-meta -->
38	38	</article><!-- #post -->

		@@ -30,8 +30,11 @@
		block discarded – undo
30	30	<?php get_template_part( 'author-bio' ); ?>
31	31	<?php endif; ?>
32	32
33		- <?php else : ?>
34		- <?php twentythirteen_entry_date(); ?>
	33	+ <?php else {
	34	+ : ?>
	35	+ <?php twentythirteen_entry_date();
	36	+}
	37	+?>
35	38	<?php edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' ); ?>
36	39	<?php endif; // is_single() ?>
37	40	</footer><!-- .entry-meta -->

		@@ -14,24 +14,24 @@
		block discarded – undo
14	14	<div id="primary" class="content-area">
15	15	<div id="content" class="site-content" role="main">
16	16
17		- <?php if ( have_posts() ) : ?>
	17	+ <?php if (have_posts()) : ?>
18	18	<header class="archive-header">
19		- <h1 class="archive-title"><?php printf( __( 'Category Archives: %s', 'twentythirteen' ), single_cat_title( '', false ) ); ?></h1>
	19	+ <h1 class="archive-title"><?php printf(__('Category Archives: %s', 'twentythirteen'), single_cat_title('', false)); ?></h1>
20	20
21		- <?php if ( category_description() ) : // Show an optional category description ?>
	21	+ <?php if (category_description()) : // Show an optional category description ?>
22	22	<div class="archive-meta"><?php echo category_description(); ?></div>
23	23	<?php endif; ?>
24	24	</header><!-- .archive-header -->
25	25
26	26	<?php /* The loop */ ?>
27		- <?php while ( have_posts() ) : the_post(); ?>
28		- <?php get_template_part( 'content', get_post_format() ); ?>
	27	+ <?php while (have_posts()) : the_post(); ?>
	28	+ <?php get_template_part('content', get_post_format()); ?>
29	29	<?php endwhile; ?>
30	30
31	31	<?php twentythirteen_paging_nav(); ?>
32	32
33	33	<?php else : ?>
34		- <?php get_template_part( 'content', 'none' ); ?>
	34	+ <?php get_template_part('content', 'none'); ?>
35	35	<?php endif; ?>
36	36
37	37	</div><!-- #content -->

		@@ -11,32 +11,32 @@
		block discarded – undo
11	11	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
12	12	<header class="entry-header">
13	13	<h1 class="entry-title">
14		- <a href="<?php echo esc_url( twentythirteen_get_link_url() ); ?>"><?php the_title(); ?></a>
	14	+ <a href="<?php echo esc_url(twentythirteen_get_link_url()); ?>"><?php the_title(); ?></a>
15	15	</h1>
16	16
17	17	<div class="entry-meta">
18	18	<?php twentythirteen_entry_date(); ?>
19		- <?php edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' ); ?>
	19	+ <?php edit_post_link(__('Edit', 'twentythirteen'), '<span class="edit-link">', '</span>'); ?>
20	20	</div><!-- .entry-meta -->
21	21	</header><!-- .entry-header -->
22	22
23	23	<div class="entry-content">
24	24	<?php
25	25	/* translators: %s: Name of current post */
26		- the_content( sprintf(
27		- __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen' ),
28		- the_title( '<span class="screen-reader-text">', '</span>', false )
29		- ) );
	26	+ the_content(sprintf(
	27	+ __('Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen'),
	28	+ the_title('<span class="screen-reader-text">', '</span>', false)
	29	+ ));
30	30
31		- wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
	31	+ wp_link_pages(array('before' => '<div class="page-links"><span class="page-links-title">'.__('Pages:', 'twentythirteen').'</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>'));
32	32	?>
33	33	</div><!-- .entry-content -->
34	34
35		- <?php if ( is_single() ) : ?>
	35	+ <?php if (is_single()) : ?>
36	36	<footer class="entry-meta">
37	37	<?php twentythirteen_entry_meta(); ?>
38		- <?php if ( get_the_author_meta( 'description' ) && is_multi_author() ) : ?>
39		- <?php get_template_part( 'author-bio' ); ?>
	38	+ <?php if (get_the_author_meta('description') && is_multi_author()) : ?>
	39	+ <?php get_template_part('author-bio'); ?>
40	40	<?php endif; ?>
41	41	</footer><!-- .entry-meta -->
42	42	<?php endif; // is_single() ?>

		@@ -17,11 +17,11 @@ discard block
		block discarded – undo
17	17	<div id="content" class="site-content" role="main">
18	18
19	19	<?php /* The loop */ ?>
20		- <?php while ( have_posts() ) : the_post(); ?>
	20	+ <?php while (have_posts()) : the_post(); ?>
21	21
22	22	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
23	23	<header class="entry-header">
24		- <?php if ( has_post_thumbnail() && ! post_password_required() ) : ?>
	24	+ <?php if (has_post_thumbnail() && ! post_password_required()) : ?>
25	25	<div class="entry-thumbnail">
26	26	<?php the_post_thumbnail(); ?>
27	27	</div>
		@@ -32,11 +32,11 @@ discard block
		block discarded – undo
32	32
33	33	<div class="entry-content">
34	34	<?php the_content(); ?>
35		- <?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
	35	+ <?php wp_link_pages(array('before' => '<div class="page-links"><span class="page-links-title">'.__('Pages:', 'twentythirteen').'</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>')); ?>
36	36	</div><!-- .entry-content -->
37	37
38	38	<footer class="entry-meta">
39		- <?php edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' ); ?>
	39	+ <?php edit_post_link(__('Edit', 'twentythirteen'), '<span class="edit-link">', '</span>'); ?>
40	40	</footer><!-- .entry-meta -->
41	41	</article><!-- #post -->
42	42

		@@ -12,21 +12,21 @@
		block discarded – undo
12	12	<div id="primary" class="content-area">
13	13	<div id="content" class="site-content" role="main">
14	14
15		- <?php if ( have_posts() ) : ?>
	15	+ <?php if (have_posts()) : ?>
16	16
17	17	<header class="page-header">
18		- <h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'twentythirteen' ), get_search_query() ); ?></h1>
	18	+ <h1 class="page-title"><?php printf(__('Search Results for: %s', 'twentythirteen'), get_search_query()); ?></h1>
19	19	</header>
20	20
21	21	<?php /* The loop */ ?>
22		- <?php while ( have_posts() ) : the_post(); ?>
23		- <?php get_template_part( 'content', get_post_format() ); ?>
	22	+ <?php while (have_posts()) : the_post(); ?>
	23	+ <?php get_template_part('content', get_post_format()); ?>
24	24	<?php endwhile; ?>
25	25
26	26	<?php twentythirteen_paging_nav(); ?>
27	27
28	28	<?php else : ?>
29		- <?php get_template_part( 'content', 'none' ); ?>
	29	+ <?php get_template_part('content', 'none'); ?>
30	30	<?php endif; ?>
31	31
32	32	</div><!-- #content -->

		@@ -18,20 +18,20 @@
		block discarded – undo
18	18	<div id="primary" class="content-area">
19	19	<div id="content" class="site-content" role="main">
20	20
21		- <?php if ( have_posts() ) : ?>
	21	+ <?php if (have_posts()) : ?>
22	22	<header class="archive-header">
23		- <h1 class="archive-title"><?php printf( __( '%s Archives', 'twentythirteen' ), '<span>' . esc_html( get_post_format_string( get_post_format() ) ) . '</span>' ); ?></h1>
	23	+ <h1 class="archive-title"><?php printf(__('%s Archives', 'twentythirteen'), '<span>'.esc_html(get_post_format_string(get_post_format())).'</span>'); ?></h1>
24	24	</header><!-- .archive-header -->
25	25
26	26	<?php /* The loop */ ?>
27		- <?php while ( have_posts() ) : the_post(); ?>
28		- <?php get_template_part( 'content', get_post_format() ); ?>
	27	+ <?php while (have_posts()) : the_post(); ?>
	28	+ <?php get_template_part('content', get_post_format()); ?>
29	29	<?php endwhile; ?>
30	30
31	31	<?php twentythirteen_paging_nav(); ?>
32	32
33	33	<?php else : ?>
34		- <?php get_template_part( 'content', 'none' ); ?>
	34	+ <?php get_template_part('content', 'none'); ?>
35	35	<?php endif; ?>
36	36
37	37	</div><!-- #content -->

ntwb / wordpress

Push — master ( d99bf9...491baf )

Category

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

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

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

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

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

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

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

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

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

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

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

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

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

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

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch