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 +7 added lines, -7 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,17 +22,17 @@  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 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.

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/inc/back-compat.php 1 patch

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

@@ -19,11 +19,11 @@  discard block
 block discarded – undo
  * @since Twenty Thirteen 1.0
  */
 function twentythirteen_switch_theme() {
-	switch_theme( WP_DEFAULT_THEME, WP_DEFAULT_THEME );
-	unset( $_GET['activated'] );
-	add_action( 'admin_notices', 'twentythirteen_upgrade_notice' );
+	switch_theme(WP_DEFAULT_THEME, WP_DEFAULT_THEME);
+	unset($_GET['activated']);
+	add_action('admin_notices', 'twentythirteen_upgrade_notice');
 }
-add_action( 'after_switch_theme', 'twentythirteen_switch_theme' );
+add_action('after_switch_theme', 'twentythirteen_switch_theme');
 
 /**
  * Add message for unsuccessful theme switch.
@@ -34,8 +34,8 @@  discard block
 block discarded – undo
  * @since Twenty Thirteen 1.0
  */
 function twentythirteen_upgrade_notice() {
-	$message = sprintf( __( 'Twenty Thirteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentythirteen' ), $GLOBALS['wp_version'] );
-	printf( '<div class="error"><p>%s</p></div>', $message );
+	$message = sprintf(__('Twenty Thirteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentythirteen'), $GLOBALS['wp_version']);
+	printf('<div class="error"><p>%s</p></div>', $message);
 }
 
 /**
@@ -44,11 +44,11 @@  discard block
 block discarded – undo
  * @since Twenty Thirteen 1.0
  */
 function twentythirteen_customize() {
-	wp_die( sprintf( __( 'Twenty Thirteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentythirteen' ), $GLOBALS['wp_version'] ), '', array(
+	wp_die(sprintf(__('Twenty Thirteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentythirteen'), $GLOBALS['wp_version']), '', array(
 		'back_link' => true,
-	) );
+	));
 }
-add_action( 'load-customize.php', 'twentythirteen_customize' );
+add_action('load-customize.php', 'twentythirteen_customize');
 
 /**
  * Prevent the Theme Preview from being loaded on WordPress versions prior to 3.4.
@@ -56,8 +56,8 @@  discard block
 block discarded – undo
  * @since Twenty Thirteen 1.0
  */
 function twentythirteen_preview() {
-	if ( isset( $_GET['preview'] ) ) {
-		wp_die( sprintf( __( 'Twenty Thirteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentythirteen' ), $GLOBALS['wp_version'] ) );
+	if (isset($_GET['preview'])) {
+		wp_die(sprintf(__('Twenty Thirteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentythirteen'), $GLOBALS['wp_version']));
 	}
 }
-add_action( 'template_redirect', 'twentythirteen_preview' );
+add_action('template_redirect', 'twentythirteen_preview');

Please login to merge, or discard this patch.

src/wp-content/themes/twentythirteen/inc/custom-header.php 2 patches

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

@@ -36,31 +36,31 @@  discard block
 block discarded – undo
 		'admin-preview-callback' => 'twentythirteen_admin_header_image',
 	);
 
-	add_theme_support( 'custom-header', $args );
+	add_theme_support('custom-header', $args);
 
 	/*
 	 * Default custom headers packaged with the theme.
 	 * %s is a placeholder for the theme template directory URI.
 	 */
-	register_default_headers( array(
+	register_default_headers(array(
 		'circle' => array(
 			'url'           => '%s/images/headers/circle.png',
 			'thumbnail_url' => '%s/images/headers/circle-thumbnail.png',
-			'description'   => _x( 'Circle', 'header image description', 'twentythirteen' )
+			'description'   => _x('Circle', 'header image description', 'twentythirteen')
 		),
 		'diamond' => array(
 			'url'           => '%s/images/headers/diamond.png',
 			'thumbnail_url' => '%s/images/headers/diamond-thumbnail.png',
-			'description'   => _x( 'Diamond', 'header image description', 'twentythirteen' )
+			'description'   => _x('Diamond', 'header image description', 'twentythirteen')
 		),
 		'star' => array(
 			'url'           => '%s/images/headers/star.png',
 			'thumbnail_url' => '%s/images/headers/star-thumbnail.png',
-			'description'   => _x( 'Star', 'header image description', 'twentythirteen' )
+			'description'   => _x('Star', 'header image description', 'twentythirteen')
 		),
-	) );
+	));
 }
-add_action( 'after_setup_theme', 'twentythirteen_custom_header_setup', 11 );
+add_action('after_setup_theme', 'twentythirteen_custom_header_setup', 11);
 
 /**
  * Load our special font CSS files.
@@ -69,12 +69,12 @@  discard block
 block discarded – undo
  */
 function twentythirteen_custom_header_fonts() {
 	// Add Source Sans Pro and Bitter fonts.
-	wp_enqueue_style( 'twentythirteen-fonts', twentythirteen_fonts_url(), array(), null );
+	wp_enqueue_style('twentythirteen-fonts', twentythirteen_fonts_url(), array(), null);
 
 	// Add Genericons font.
-	wp_enqueue_style( 'genericons', get_template_directory_uri() . '/genericons/genericons.css', array(), '3.03' );
+	wp_enqueue_style('genericons', get_template_directory_uri().'/genericons/genericons.css', array(), '3.03');
 }
-add_action( 'admin_print_styles-appearance_page_custom-header', 'twentythirteen_custom_header_fonts' );
+add_action('admin_print_styles-appearance_page_custom-header', 'twentythirteen_custom_header_fonts');
 
 /**
  * Style the header text displayed on the blog.
@@ -88,14 +88,14 @@  discard block
 block discarded – undo
 	$text_color   = get_header_textcolor();
 
 	// If no custom options for text are set, let's bail.
-	if ( empty( $header_image ) && $text_color == get_theme_support( 'custom-header', 'default-text-color' ) )
+	if (empty($header_image) && $text_color == get_theme_support('custom-header', 'default-text-color'))
 		return;
 
 	// If we get this far, we have custom styles.
 	?>
 	<style type="text/css" id="twentythirteen-header-css">
 	<?php
-		if ( ! empty( $header_image ) ) :
+		if ( ! empty($header_image)) :
 	?>
 		.site-header {
 			background: url(<?php header_image(); ?>) no-repeat scroll top;
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
 		endif;
 
 		// Has the text been hidden?
-		if ( ! display_header_text() ) :
+		if ( ! display_header_text()) :
 	?>
 		.site-title,
 		.site-description {
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
 			clip: rect(1px, 1px, 1px, 1px);
 		}
 	<?php
-			if ( empty( $header_image ) ) :
+			if (empty($header_image)) :
 	?>
 		.site-header .home-link {
 			min-height: 0;
@@ -133,11 +133,11 @@  discard block
 block discarded – undo
 			endif;
 
 		// If the user has set a custom color for the text, use that.
-		elseif ( $text_color != get_theme_support( 'custom-header', 'default-text-color' ) ) :
+		elseif ($text_color != get_theme_support('custom-header', 'default-text-color')) :
 	?>
 		.site-title,
 		.site-description {
-			color: #<?php echo esc_attr( $text_color ); ?>;
+			color: #<?php echo esc_attr($text_color); ?>;
 		}
 	<?php endif; ?>
 	</style>
@@ -159,8 +159,8 @@  discard block
 block discarded – undo
 		-moz-box-sizing:    border-box;
 		box-sizing:         border-box;
 		<?php
-		if ( ! empty( $header_image ) ) {
-			echo 'background: url(' . esc_url( $header_image ) . ') no-repeat scroll top; background-size: 1600px auto;';
+		if ( ! empty($header_image)) {
+			echo 'background: url('.esc_url($header_image).') no-repeat scroll top; background-size: 1600px auto;';
 		} ?>
 		padding: 0 20px;
 	}
@@ -171,12 +171,12 @@  discard block
 block discarded – undo
 		margin: 0 auto;
 		max-width: 1040px;
 		<?php
-		if ( ! empty( $header_image ) || display_header_text() ) {
+		if ( ! empty($header_image) || display_header_text()) {
 			echo 'min-height: 230px;';
 		} ?>
 		width: 100%;
 	}
-	<?php if ( ! display_header_text() ) : ?>
+	<?php if ( ! display_header_text()) : ?>
 	#headimg h1,
 	#headimg h2 {
 		position: absolute !important;
@@ -216,15 +216,15 @@  discard block
 block discarded – undo
  * @since Twenty Thirteen 1.0
  */
 function twentythirteen_admin_header_image() {
-	$style = 'color: #' . get_header_textcolor() . ';';
-	if ( ! display_header_text() ) {
+	$style = 'color: #'.get_header_textcolor().';';
+	if ( ! display_header_text()) {
 		$style = 'display: none;';
 	}
 	?>
-	<div id="headimg" style="background: url(<?php echo esc_url( get_header_image() ); ?>) no-repeat scroll top; background-size: 1600px auto;">
+	<div id="headimg" style="background: url(<?php echo esc_url(get_header_image()); ?>) no-repeat scroll top; background-size: 1600px auto;">
 		<div class="home-link">
-			<h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr( $style ); ?>" onclick="return false;" href="#" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
-			<h2 id="desc" class="displaying-header-text" style="<?php echo esc_attr( $style ); ?>"><?php bloginfo( 'description' ); ?></h2>
+			<h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr($style); ?>" onclick="return false;" href="#" tabindex="-1"><?php bloginfo('name'); ?></a></h1>
+			<h2 id="desc" class="displaying-header-text" style="<?php echo esc_attr($style); ?>"><?php bloginfo('description'); ?></h2>
 		</div>
 	</div>
 <?php }

Please login to merge, or discard this patch.

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

@@ -88,8 +88,9 @@
 block discarded – undo
 	$text_color   = get_header_textcolor();
 
 	// If no custom options for text are set, let's bail.
-	if ( empty( $header_image ) && $text_color == get_theme_support( 'custom-header', 'default-text-color' ) )
-		return;
+	if ( empty( $header_image ) && $text_color == get_theme_support( 'custom-header', 'default-text-color' ) ) {
+			return;
+	}
 
 	// If we get this far, we have custom styles.
 	?>

Please login to merge, or discard this patch.

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

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

@@ -22,30 +22,30 @@
 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
-					if ( is_day() ) :
-						printf( __( 'Daily Archives: %s', 'twentythirteen' ), get_the_date() );
-					elseif ( is_month() ) :
-						printf( __( 'Monthly Archives: %s', 'twentythirteen' ), get_the_date( _x( 'F Y', 'monthly archives date format', 'twentythirteen' ) ) );
-					elseif ( is_year() ) :
-						printf( __( 'Yearly Archives: %s', 'twentythirteen' ), get_the_date( _x( 'Y', 'yearly archives date format', 'twentythirteen' ) ) );
+					if (is_day()) :
+						printf(__('Daily Archives: %s', 'twentythirteen'), get_the_date());
+					elseif (is_month()) :
+						printf(__('Monthly Archives: %s', 'twentythirteen'), get_the_date(_x('F Y', 'monthly archives date format', 'twentythirteen')));
+					elseif (is_year()) :
+						printf(__('Yearly Archives: %s', 'twentythirteen'), get_the_date(_x('Y', 'yearly archives date format', 'twentythirteen')));
 					else :
-						_e( 'Archives', 'twentythirteen' );
+						_e('Archives', 'twentythirteen');
 					endif;
 				?></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 +8 added lines, -3 removed lines patch added patch discarded remove patch

@@ -31,8 +31,10 @@  discard block
 block discarded – undo
 						printf( __( 'Monthly Archives: %s', 'twentythirteen' ), get_the_date( _x( 'F Y', 'monthly archives date format', 'twentythirteen' ) ) );
 					elseif ( is_year() ) :
 						printf( __( 'Yearly Archives: %s', 'twentythirteen' ), get_the_date( _x( 'Y', 'yearly archives date format', 'twentythirteen' ) ) );
-					else :
+					else {
+						:
 						_e( 'Archives', 'twentythirteen' );
+					}
 					endif;
 				?></h1>
 			</header><!-- .archive-header -->
@@ -44,8 +46,11 @@  discard block
 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/sidebar-main.php 1 patch

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

@@ -9,10 +9,10 @@
 block discarded – undo
  * @since Twenty Thirteen 1.0
  */
 
-if ( is_active_sidebar( 'sidebar-1' ) ) : ?>
+if (is_active_sidebar('sidebar-1')) : ?>
 	<div id="secondary" class="sidebar-container" role="complementary">
 		<div class="widget-area">
-			<?php dynamic_sidebar( 'sidebar-1' ); ?>
+			<?php dynamic_sidebar('sidebar-1'); ?>
 		</div><!-- .widget-area -->
 	</div><!-- #secondary -->
 <?php endif; ?>
\ No newline at end of file

Please login to merge, or discard this patch.

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

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

@@ -12,21 +12,21 @@
 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 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.

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

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

@@ -14,7 +14,7 @@  discard block
 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
 				/*
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
 			?>
 
 			<header class="archive-header">
-				<h1 class="archive-title"><?php printf( __( 'All posts by %s', 'twentythirteen' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' ); ?></h1>
+				<h1 class="archive-title"><?php printf(__('All posts by %s', 'twentythirteen'), '<span class="vcard"><a class="url fn n" href="'.esc_url(get_author_posts_url(get_the_author_meta('ID'))).'" title="'.esc_attr(get_the_author()).'" rel="me">'.get_the_author().'</a></span>'); ?></h1>
 			</header><!-- .archive-header -->
 
 			<?php
@@ -40,19 +40,19 @@  discard block
 block discarded – undo
 				rewind_posts();
 			?>
 
-			<?php if ( get_the_author_meta( 'description' ) ) : ?>
-				<?php get_template_part( 'author-bio' ); ?>
+			<?php if (get_the_author_meta('description')) : ?>
+				<?php get_template_part('author-bio'); ?>
 			<?php endif; ?>
 
 			<?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/single.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" class="site-content" role="main">
 
 			<?php /* The loop */ ?>
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php while (have_posts()) : the_post(); ?>
 
-				<?php get_template_part( 'content', get_post_format() ); ?>
+				<?php get_template_part('content', get_post_format()); ?>
 				<?php twentythirteen_post_nav(); ?>
 				<?php comments_template(); ?>
 

Please login to merge, or discard this patch.

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

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

@@ -13,13 +13,13 @@
 block discarded – undo
 		<div id="content" class="site-content" role="main">
 
 			<header class="page-header">
-				<h1 class="page-title"><?php _e( 'Not Found', 'twentythirteen' ); ?></h1>
+				<h1 class="page-title"><?php _e('Not Found', 'twentythirteen'); ?></h1>
 			</header>
 
 			<div class="page-wrapper">
 				<div class="page-content">
-					<h2><?php _e( 'This is somewhat embarrassing, isn&rsquo;t it?', 'twentythirteen' ); ?></h2>
-					<p><?php _e( 'It looks like nothing was found at this location. Maybe try a search?', 'twentythirteen' ); ?></p>
+					<h2><?php _e('This is somewhat embarrassing, isn&rsquo;t it?', 'twentythirteen'); ?></h2>
+					<p><?php _e('It looks like nothing was found at this location. Maybe try a search?', 'twentythirteen'); ?></p>
 
 					<?php get_search_form(); ?>
 				</div><!-- .page-content -->

Please login to merge, or discard this patch.

		@@ -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,17 +22,17 @@ 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		- <?php edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' ); ?>
	36	+ <?php edit_post_link(__('Edit', 'twentythirteen'), '<span class="edit-link">', '</span>'); ?>
37	37	</footer><!-- .entry-meta -->
38	38	</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 -->

		@@ -19,11 +19,11 @@ discard block
		block discarded – undo
19	19	* @since Twenty Thirteen 1.0
20	20	*/
21	21	function twentythirteen_switch_theme() {
22		- switch_theme( WP_DEFAULT_THEME, WP_DEFAULT_THEME );
23		- unset( $_GET['activated'] );
24		- add_action( 'admin_notices', 'twentythirteen_upgrade_notice' );
	22	+ switch_theme(WP_DEFAULT_THEME, WP_DEFAULT_THEME);
	23	+ unset($_GET['activated']);
	24	+ add_action('admin_notices', 'twentythirteen_upgrade_notice');
25	25	}
26		-add_action( 'after_switch_theme', 'twentythirteen_switch_theme' );
	26	+add_action('after_switch_theme', 'twentythirteen_switch_theme');
27	27
28	28	/**
29	29	* Add message for unsuccessful theme switch.
		@@ -34,8 +34,8 @@ discard block
		block discarded – undo
34	34	* @since Twenty Thirteen 1.0
35	35	*/
36	36	function twentythirteen_upgrade_notice() {
37		- $message = sprintf( __( 'Twenty Thirteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentythirteen' ), $GLOBALS['wp_version'] );
38		- printf( '<div class="error"><p>%s</p></div>', $message );
	37	+ $message = sprintf(__('Twenty Thirteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentythirteen'), $GLOBALS['wp_version']);
	38	+ printf('<div class="error"><p>%s</p></div>', $message);
39	39	}
40	40
41	41	/**
		@@ -44,11 +44,11 @@ discard block
		block discarded – undo
44	44	* @since Twenty Thirteen 1.0
45	45	*/
46	46	function twentythirteen_customize() {
47		- wp_die( sprintf( __( 'Twenty Thirteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentythirteen' ), $GLOBALS['wp_version'] ), '', array(
	47	+ wp_die(sprintf(__('Twenty Thirteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentythirteen'), $GLOBALS['wp_version']), '', array(
48	48	'back_link' => true,
49		- ) );
	49	+ ));
50	50	}
51		-add_action( 'load-customize.php', 'twentythirteen_customize' );
	51	+add_action('load-customize.php', 'twentythirteen_customize');
52	52
53	53	/**
54	54	* Prevent the Theme Preview from being loaded on WordPress versions prior to 3.4.
		@@ -56,8 +56,8 @@ discard block
		block discarded – undo
56	56	* @since Twenty Thirteen 1.0
57	57	*/
58	58	function twentythirteen_preview() {
59		- if ( isset( $_GET['preview'] ) ) {
60		- wp_die( sprintf( __( 'Twenty Thirteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentythirteen' ), $GLOBALS['wp_version'] ) );
	59	+ if (isset($_GET['preview'])) {
	60	+ wp_die(sprintf(__('Twenty Thirteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentythirteen'), $GLOBALS['wp_version']));
61	61	}
62	62	}
63		-add_action( 'template_redirect', 'twentythirteen_preview' );
	63	+add_action('template_redirect', 'twentythirteen_preview');

		@@ -36,31 +36,31 @@ discard block
		block discarded – undo
36	36	'admin-preview-callback' => 'twentythirteen_admin_header_image',
37	37	);
38	38
39		- add_theme_support( 'custom-header', $args );
	39	+ add_theme_support('custom-header', $args);
40	40
41	41	/*
42	42	* Default custom headers packaged with the theme.
43	43	* %s is a placeholder for the theme template directory URI.
44	44	*/
45		- register_default_headers( array(
	45	+ register_default_headers(array(
46	46	'circle' => array(
47	47	'url' => '%s/images/headers/circle.png',
48	48	'thumbnail_url' => '%s/images/headers/circle-thumbnail.png',
49		- 'description' => _x( 'Circle', 'header image description', 'twentythirteen' )
	49	+ 'description' => _x('Circle', 'header image description', 'twentythirteen')
50	50	),
51	51	'diamond' => array(
52	52	'url' => '%s/images/headers/diamond.png',
53	53	'thumbnail_url' => '%s/images/headers/diamond-thumbnail.png',
54		- 'description' => _x( 'Diamond', 'header image description', 'twentythirteen' )
	54	+ 'description' => _x('Diamond', 'header image description', 'twentythirteen')
55	55	),
56	56	'star' => array(
57	57	'url' => '%s/images/headers/star.png',
58	58	'thumbnail_url' => '%s/images/headers/star-thumbnail.png',
59		- 'description' => _x( 'Star', 'header image description', 'twentythirteen' )
	59	+ 'description' => _x('Star', 'header image description', 'twentythirteen')
60	60	),
61		- ) );
	61	+ ));
62	62	}
63		-add_action( 'after_setup_theme', 'twentythirteen_custom_header_setup', 11 );
	63	+add_action('after_setup_theme', 'twentythirteen_custom_header_setup', 11);
64	64
65	65	/**
66	66	* Load our special font CSS files.
		@@ -69,12 +69,12 @@ discard block
		block discarded – undo
69	69	*/
70	70	function twentythirteen_custom_header_fonts() {
71	71	// Add Source Sans Pro and Bitter fonts.
72		- wp_enqueue_style( 'twentythirteen-fonts', twentythirteen_fonts_url(), array(), null );
	72	+ wp_enqueue_style('twentythirteen-fonts', twentythirteen_fonts_url(), array(), null);
73	73
74	74	// Add Genericons font.
75		- wp_enqueue_style( 'genericons', get_template_directory_uri() . '/genericons/genericons.css', array(), '3.03' );
	75	+ wp_enqueue_style('genericons', get_template_directory_uri().'/genericons/genericons.css', array(), '3.03');
76	76	}
77		-add_action( 'admin_print_styles-appearance_page_custom-header', 'twentythirteen_custom_header_fonts' );
	77	+add_action('admin_print_styles-appearance_page_custom-header', 'twentythirteen_custom_header_fonts');
78	78
79	79	/**
80	80	* Style the header text displayed on the blog.
		@@ -88,14 +88,14 @@ discard block
		block discarded – undo
88	88	$text_color = get_header_textcolor();
89	89
90	90	// If no custom options for text are set, let's bail.
91		- if ( empty( $header_image ) && $text_color == get_theme_support( 'custom-header', 'default-text-color' ) )
	91	+ if (empty($header_image) && $text_color == get_theme_support('custom-header', 'default-text-color'))
92	92	return;
93	93
94	94	// If we get this far, we have custom styles.
95	95	?>
96	96	<style type="text/css" id="twentythirteen-header-css">
97	97	<?php
98		- if ( ! empty( $header_image ) ) :
	98	+ if ( ! empty($header_image)) :
99	99	?>
100	100	.site-header {
101	101	background: url(<?php header_image(); ?>) no-repeat scroll top;
		@@ -115,7 +115,7 @@ discard block
		block discarded – undo
115	115	endif;
116	116
117	117	// Has the text been hidden?
118		- if ( ! display_header_text() ) :
	118	+ if ( ! display_header_text()) :
119	119	?>
120	120	.site-title,
121	121	.site-description {
		@@ -124,7 +124,7 @@ discard block
		block discarded – undo
124	124	clip: rect(1px, 1px, 1px, 1px);
125	125	}
126	126	<?php
127		- if ( empty( $header_image ) ) :
	127	+ if (empty($header_image)) :
128	128	?>
129	129	.site-header .home-link {
130	130	min-height: 0;
		@@ -133,11 +133,11 @@ discard block
		block discarded – undo
133	133	endif;
134	134
135	135	// If the user has set a custom color for the text, use that.
136		- elseif ( $text_color != get_theme_support( 'custom-header', 'default-text-color' ) ) :
	136	+ elseif ($text_color != get_theme_support('custom-header', 'default-text-color')) :
137	137	?>
138	138	.site-title,
139	139	.site-description {
140		- color: #<?php echo esc_attr( $text_color ); ?>;
	140	+ color: #<?php echo esc_attr($text_color); ?>;
141	141	}
142	142	<?php endif; ?>
143	143	</style>
		@@ -159,8 +159,8 @@ discard block
		block discarded – undo
159	159	-moz-box-sizing: border-box;
160	160	box-sizing: border-box;
161	161	<?php
162		- if ( ! empty( $header_image ) ) {
163		- echo 'background: url(' . esc_url( $header_image ) . ') no-repeat scroll top; background-size: 1600px auto;';
	162	+ if ( ! empty($header_image)) {
	163	+ echo 'background: url('.esc_url($header_image).') no-repeat scroll top; background-size: 1600px auto;';
164	164	} ?>
165	165	padding: 0 20px;
166	166	}
		@@ -171,12 +171,12 @@ discard block
		block discarded – undo
171	171	margin: 0 auto;
172	172	max-width: 1040px;
173	173	<?php
174		- if ( ! empty( $header_image ) \|\| display_header_text() ) {
	174	+ if ( ! empty($header_image) \|\| display_header_text()) {
175	175	echo 'min-height: 230px;';
176	176	} ?>
177	177	width: 100%;
178	178	}
179		- <?php if ( ! display_header_text() ) : ?>
	179	+ <?php if ( ! display_header_text()) : ?>
180	180	#headimg h1,
181	181	#headimg h2 {
182	182	position: absolute !important;
		@@ -216,15 +216,15 @@ discard block
		block discarded – undo
216	216	* @since Twenty Thirteen 1.0
217	217	*/
218	218	function twentythirteen_admin_header_image() {
219		- $style = 'color: #' . get_header_textcolor() . ';';
220		- if ( ! display_header_text() ) {
	219	+ $style = 'color: #'.get_header_textcolor().';';
	220	+ if ( ! display_header_text()) {
221	221	$style = 'display: none;';
222	222	}
223	223	?>
224		- <div id="headimg" style="background: url(<?php echo esc_url( get_header_image() ); ?>) no-repeat scroll top; background-size: 1600px auto;">
	224	+ <div id="headimg" style="background: url(<?php echo esc_url(get_header_image()); ?>) no-repeat scroll top; background-size: 1600px auto;">
225	225	<div class="home-link">
226		- <h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr( $style ); ?>" onclick="return false;" href="#" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
227		- <h2 id="desc" class="displaying-header-text" style="<?php echo esc_attr( $style ); ?>"><?php bloginfo( 'description' ); ?></h2>
	226	+ <h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr($style); ?>" onclick="return false;" href="#" tabindex="-1"><?php bloginfo('name'); ?></a></h1>
	227	+ <h2 id="desc" class="displaying-header-text" style="<?php echo esc_attr($style); ?>"><?php bloginfo('description'); ?></h2>
228	228	</div>
229	229	</div>
230	230	<?php }

		@@ -88,8 +88,9 @@
		block discarded – undo
88	88	$text_color = get_header_textcolor();
89	89
90	90	// If no custom options for text are set, let's bail.
91		- if ( empty( $header_image ) && $text_color == get_theme_support( 'custom-header', 'default-text-color' ) )
92		- return;
	91	+ if ( empty( $header_image ) && $text_color == get_theme_support( 'custom-header', 'default-text-color' ) ) {
	92	+ return;
	93	+ }
93	94
94	95	// If we get this far, we have custom styles.
95	96	?>

		@@ -22,30 +22,30 @@
		block discarded – undo
22	22	<div id="primary" class="content-area">
23	23	<div id="content" class="site-content" role="main">
24	24
25		- <?php if ( have_posts() ) : ?>
	25	+ <?php if (have_posts()) : ?>
26	26	<header class="archive-header">
27	27	<h1 class="archive-title"><?php
28		- if ( is_day() ) :
29		- printf( __( 'Daily Archives: %s', 'twentythirteen' ), get_the_date() );
30		- elseif ( is_month() ) :
31		- printf( __( 'Monthly Archives: %s', 'twentythirteen' ), get_the_date( _x( 'F Y', 'monthly archives date format', 'twentythirteen' ) ) );
32		- elseif ( is_year() ) :
33		- printf( __( 'Yearly Archives: %s', 'twentythirteen' ), get_the_date( _x( 'Y', 'yearly archives date format', 'twentythirteen' ) ) );
	28	+ if (is_day()) :
	29	+ printf(__('Daily Archives: %s', 'twentythirteen'), get_the_date());
	30	+ elseif (is_month()) :
	31	+ printf(__('Monthly Archives: %s', 'twentythirteen'), get_the_date(_x('F Y', 'monthly archives date format', 'twentythirteen')));
	32	+ elseif (is_year()) :
	33	+ printf(__('Yearly Archives: %s', 'twentythirteen'), get_the_date(_x('Y', 'yearly archives date format', 'twentythirteen')));
34	34	else :
35		- _e( 'Archives', 'twentythirteen' );
	35	+ _e('Archives', 'twentythirteen');
36	36	endif;
37	37	?></h1>
38	38	</header><!-- .archive-header -->
39	39
40	40	<?php /* The loop */ ?>
41		- <?php while ( have_posts() ) : the_post(); ?>
42		- <?php get_template_part( 'content', get_post_format() ); ?>
	41	+ <?php while (have_posts()) : the_post(); ?>
	42	+ <?php get_template_part('content', get_post_format()); ?>
43	43	<?php endwhile; ?>
44	44
45	45	<?php twentythirteen_paging_nav(); ?>
46	46
47	47	<?php else : ?>
48		- <?php get_template_part( 'content', 'none' ); ?>
	48	+ <?php get_template_part('content', 'none'); ?>
49	49	<?php endif; ?>
50	50
51	51	</div><!-- #content -->

		@@ -31,8 +31,10 @@ discard block
		block discarded – undo
31	31	printf( __( 'Monthly Archives: %s', 'twentythirteen' ), get_the_date( _x( 'F Y', 'monthly archives date format', 'twentythirteen' ) ) );
32	32	elseif ( is_year() ) :
33	33	printf( __( 'Yearly Archives: %s', 'twentythirteen' ), get_the_date( _x( 'Y', 'yearly archives date format', 'twentythirteen' ) ) );
34		- else :
	34	+ else {
	35	+ :
35	36	_e( 'Archives', 'twentythirteen' );
	37	+ }
36	38	endif;
37	39	?></h1>
38	40	</header><!-- .archive-header -->
		@@ -44,8 +46,11 @@ discard block
		block discarded – undo
44	46
45	47	<?php twentythirteen_paging_nav(); ?>
46	48
47		- <?php else : ?>
48		- <?php get_template_part( 'content', 'none' ); ?>
	49	+ <?php else {
	50	+ : ?>
	51	+ <?php get_template_part( 'content', 'none' );
	52	+}
	53	+?>
49	54	<?php endif; ?>
50	55
51	56	</div><!-- #content -->

		@@ -9,10 +9,10 @@
		block discarded – undo
9	9	* @since Twenty Thirteen 1.0
10	10	*/
11	11
12		-if ( is_active_sidebar( 'sidebar-1' ) ) : ?>
	12	+if (is_active_sidebar('sidebar-1')) : ?>
13	13	<div id="secondary" class="sidebar-container" role="complementary">
14	14	<div class="widget-area">
15		- <?php dynamic_sidebar( 'sidebar-1' ); ?>
	15	+ <?php dynamic_sidebar('sidebar-1'); ?>
16	16	</div><!-- .widget-area -->
17	17	</div><!-- #secondary -->
18	18	<?php endif; ?>
19	19	\ No newline at end of file

		@@ -12,21 +12,21 @@
		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	25	<?php twentythirteen_entry_meta(); ?>
26		- <?php edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' ); ?>
	26	+ <?php edit_post_link(__('Edit', 'twentythirteen'), '<span class="edit-link">', '</span>'); ?>
27	27
28		- <?php if ( is_single() && get_the_author_meta( 'description' ) && is_multi_author() ) : ?>
29		- <?php get_template_part( 'author-bio' ); ?>
	28	+ <?php if (is_single() && get_the_author_meta('description') && is_multi_author()) : ?>
	29	+ <?php get_template_part('author-bio'); ?>
30	30	<?php endif; ?>
31	31	</footer><!-- .entry-meta -->
32	32	</article><!-- #post -->

		@@ -14,7 +14,7 @@ discard block
		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
19	19	<?php
20	20	/*
		@@ -28,7 +28,7 @@ discard block
		block discarded – undo
28	28	?>
29	29
30	30	<header class="archive-header">
31		- <h1 class="archive-title"><?php printf( __( 'All posts by %s', 'twentythirteen' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' ); ?></h1>
	31	+ <h1 class="archive-title"><?php printf(__('All posts by %s', 'twentythirteen'), '<span class="vcard"><a class="url fn n" href="'.esc_url(get_author_posts_url(get_the_author_meta('ID'))).'" title="'.esc_attr(get_the_author()).'" rel="me">'.get_the_author().'</a></span>'); ?></h1>
32	32	</header><!-- .archive-header -->
33	33
34	34	<?php
		@@ -40,19 +40,19 @@ discard block
		block discarded – undo
40	40	rewind_posts();
41	41	?>
42	42
43		- <?php if ( get_the_author_meta( 'description' ) ) : ?>
44		- <?php get_template_part( 'author-bio' ); ?>
	43	+ <?php if (get_the_author_meta('description')) : ?>
	44	+ <?php get_template_part('author-bio'); ?>
45	45	<?php endif; ?>
46	46
47	47	<?php /* The loop */ ?>
48		- <?php while ( have_posts() ) : the_post(); ?>
49		- <?php get_template_part( 'content', get_post_format() ); ?>
	48	+ <?php while (have_posts()) : the_post(); ?>
	49	+ <?php get_template_part('content', get_post_format()); ?>
50	50	<?php endwhile; ?>
51	51
52	52	<?php twentythirteen_paging_nav(); ?>
53	53
54	54	<?php else : ?>
55		- <?php get_template_part( 'content', 'none' ); ?>
	55	+ <?php get_template_part('content', 'none'); ?>
56	56	<?php endif; ?>
57	57
58	58	</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 -->

		@@ -13,9 +13,9 @@
		block discarded – undo
13	13	<div id="content" class="site-content" role="main">
14	14
15	15	<?php /* The loop */ ?>
16		- <?php while ( have_posts() ) : the_post(); ?>
	16	+ <?php while (have_posts()) : the_post(); ?>
17	17
18		- <?php get_template_part( 'content', get_post_format() ); ?>
	18	+ <?php get_template_part('content', get_post_format()); ?>
19	19	<?php twentythirteen_post_nav(); ?>
20	20	<?php comments_template(); ?>
21	21

		@@ -13,13 +13,13 @@
		block discarded – undo
13	13	<div id="content" class="site-content" role="main">
14	14
15	15	<header class="page-header">
16		- <h1 class="page-title"><?php _e( 'Not Found', 'twentythirteen' ); ?></h1>
	16	+ <h1 class="page-title"><?php _e('Not Found', 'twentythirteen'); ?></h1>
17	17	</header>
18	18
19	19	<div class="page-wrapper">
20	20	<div class="page-content">
21		- <h2><?php _e( 'This is somewhat embarrassing, isn’t it?', 'twentythirteen' ); ?></h2>
22		- <p><?php _e( 'It looks like nothing was found at this location. Maybe try a search?', 'twentythirteen' ); ?></p>
	21	+ <h2><?php _e('This is somewhat embarrassing, isn’t it?', 'twentythirteen'); ?></h2>
	22	+ <p><?php _e('It looks like nothing was found at this location. Maybe try a search?', 'twentythirteen'); ?></p>
23	23
24	24	<?php get_search_form(); ?>
25	25	</div><!-- .page-content -->

ntwb / wordpress

Push — master ( d99bf9...491baf )

Category

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

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

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

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

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

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

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

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

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

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

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