ntwb / wordpress

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

Spacing +17 added lines, -17 removed lines

@@ -12,51 +12,51 @@
 	<?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( 'image' ) ); ?>"><?php echo get_post_format_string( 'image' ); ?></a>
+				<a class="entry-format" href="<?php echo esc_url(get_post_format_link('image')); ?>"><?php echo get_post_format_string('image'); ?></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-## -->

Braces +3 added lines, -1 removed lines

@@ -21,8 +21,10 @@
 
 			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;
 		?>
 

src/wp-content/themes/twentyfourteen/search.php

Spacing +6 added lines, -6 removed lines

@@ -12,22 +12,22 @@ 
 	<section 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', 'twentyfourteen' ), get_search_query() ); ?></h1>
+				<h1 class="page-title"><?php printf(__('Search Results for: %s', 'twentyfourteen'), get_search_query()); ?></h1>
 			</header><!-- .page-header -->
 
 				<?php
 					// Start the Loop.
-					while ( have_posts() ) : the_post();
+					while (have_posts()) : the_post();
 
 						/*
 						 * Include the post format-specific template for the content. If you want to
 						 * use this in a child theme, then include a file called called content-___.php
 						 * (where ___ is the post format) and that will be used instead.
 						 */
-						get_template_part( 'content', get_post_format() );
+						get_template_part('content', get_post_format());
 
 					endwhile;
 					// Previous/next post navigation.
@@ -35,7 +35,7 @@ 
 
 				else :
 					// If no content, include the "No posts found" template.
-					get_template_part( 'content', 'none' );
+					get_template_part('content', 'none');
 
 				endif;
 			?>
@@ -44,6 +44,6 @@ 
 	</section><!-- #primary -->
 
 <?php
-get_sidebar( 'content' );
+get_sidebar('content');
 get_sidebar();
 get_footer();

Braces +3 added lines, -1 removed lines

@@ -33,9 +33,11 @@
 					// Previous/next post navigation.
 					twentyfourteen_paging_nav();
 
-				else :
+				else {
+					:
 					// If no content, include the "No posts found" template.
 					get_template_part( 'content', 'none' );
+				}
 
 				endif;
 			?>

src/wp-content/themes/twentyfourteen/sidebar-footer.php

Spacing +2 added lines, -2 removed lines

@@ -7,13 +7,13 @@
  * @since Twenty Fourteen 1.0
  */
 
-if ( ! is_active_sidebar( 'sidebar-3' ) ) {
+if ( ! is_active_sidebar('sidebar-3')) {
 	return;
 }
 ?>
 
 <div id="supplementary">
 	<div id="footer-sidebar" class="footer-sidebar widget-area" role="complementary">
-		<?php dynamic_sidebar( 'sidebar-3' ); ?>
+		<?php dynamic_sidebar('sidebar-3'); ?>
 	</div><!-- #footer-sidebar -->
 </div><!-- #supplementary -->

src/wp-content/themes/twentyfourteen/taxonomy-post_format.php

Spacing +20 added lines, -20 removed lines

@@ -21,34 +21,34 @@ 
 	<section 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_tax( 'post_format', 'post-format-aside' ) ) :
-							_e( 'Asides', 'twentyfourteen' );
+						if (is_tax('post_format', 'post-format-aside')) :
+							_e('Asides', 'twentyfourteen');
 
-						elseif ( is_tax( 'post_format', 'post-format-image' ) ) :
-							_e( 'Images', 'twentyfourteen' );
+						elseif (is_tax('post_format', 'post-format-image')) :
+							_e('Images', 'twentyfourteen');
 
-						elseif ( is_tax( 'post_format', 'post-format-video' ) ) :
-							_e( 'Videos', 'twentyfourteen' );
+						elseif (is_tax('post_format', 'post-format-video')) :
+							_e('Videos', 'twentyfourteen');
 
-						elseif ( is_tax( 'post_format', 'post-format-audio' ) ) :
-							_e( 'Audio', 'twentyfourteen' );
+						elseif (is_tax('post_format', 'post-format-audio')) :
+							_e('Audio', 'twentyfourteen');
 
-						elseif ( is_tax( 'post_format', 'post-format-quote' ) ) :
-							_e( 'Quotes', 'twentyfourteen' );
+						elseif (is_tax('post_format', 'post-format-quote')) :
+							_e('Quotes', 'twentyfourteen');
 
-						elseif ( is_tax( 'post_format', 'post-format-link' ) ) :
-							_e( 'Links', 'twentyfourteen' );
+						elseif (is_tax('post_format', 'post-format-link')) :
+							_e('Links', 'twentyfourteen');
 
-						elseif ( is_tax( 'post_format', 'post-format-gallery' ) ) :
-							_e( 'Galleries', 'twentyfourteen' );
+						elseif (is_tax('post_format', 'post-format-gallery')) :
+							_e('Galleries', 'twentyfourteen');
 
 						else :
-							_e( 'Archives', 'twentyfourteen' );
+							_e('Archives', 'twentyfourteen');
 
 						endif;
 					?>
@@ -57,14 +57,14 @@ 
 
 			<?php
 					// Start the Loop.
-					while ( have_posts() ) : the_post();
+					while (have_posts()) : the_post();
 
 						/*
 						 * Include the post format-specific template for the content. If you want to
 						 * use this in a child theme, then include a file called called content-___.php
 						 * (where ___ is the post format) and that will be used instead.
 						 */
-						get_template_part( 'content', get_post_format() );
+						get_template_part('content', get_post_format());
 
 					endwhile;
 					// Previous/next page navigation.
@@ -72,7 +72,7 @@ 
 
 				else :
 					// If no content, include the "No posts found" template.
-					get_template_part( 'content', 'none' );
+					get_template_part('content', 'none');
 
 				endif;
 			?>
@@ -80,6 +80,6 @@ 
 	</section><!-- #primary -->
 
 <?php
-get_sidebar( 'content' );
+get_sidebar('content');
 get_sidebar();
 get_footer();

Braces +6 added lines, -2 removed lines

@@ -47,8 +47,10 @@ 
 						elseif ( is_tax( 'post_format', 'post-format-gallery' ) ) :
 							_e( 'Galleries', 'twentyfourteen' );
 
-						else :
+						else {
+							:
 							_e( 'Archives', 'twentyfourteen' );
+						}
 
 						endif;
 					?>
@@ -70,9 +72,11 @@ 
 					// Previous/next page navigation.
 					twentyfourteen_paging_nav();
 
-				else :
+				else {
+					:
 					// If no content, include the "No posts found" template.
 					get_template_part( 'content', 'none' );
+				}
 
 				endif;
 			?>

src/wp-content/themes/twentyfourteen/tag.php

Spacing +8 added lines, -8 removed lines

@@ -16,30 +16,30 @@ 
 	<section 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( __( 'Tag Archives: %s', 'twentyfourteen' ), single_tag_title( '', false ) ); ?></h1>
+				<h1 class="archive-title"><?php printf(__('Tag Archives: %s', 'twentyfourteen'), single_tag_title('', false)); ?></h1>
 
 				<?php
 					// Show an optional term description.
 					$term_description = term_description();
-					if ( ! empty( $term_description ) ) :
-						printf( '<div class="taxonomy-description">%s</div>', $term_description );
+					if ( ! empty($term_description)) :
+						printf('<div class="taxonomy-description">%s</div>', $term_description);
 					endif;
 				?>
 			</header><!-- .archive-header -->
 
 			<?php
 					// Start the Loop.
-					while ( have_posts() ) : the_post();
+					while (have_posts()) : the_post();
 
 						/*
 						 * Include the post format-specific template for the content. If you want to
 						 * use this in a child theme, then include a file called called content-___.php
 						 * (where ___ is the post format) and that will be used instead.
 						 */
-						get_template_part( 'content', get_post_format() );
+						get_template_part('content', get_post_format());
 
 					endwhile;
 					// Previous/next page navigation.
@@ -47,7 +47,7 @@ 
 
 				else :
 					// If no content, include the "No posts found" template.
-					get_template_part( 'content', 'none' );
+					get_template_part('content', 'none');
 
 				endif;
 			?>
@@ -55,6 +55,6 @@ 
 	</section><!-- #primary -->
 
 <?php
-get_sidebar( 'content' );
+get_sidebar('content');
 get_sidebar();
 get_footer();

Braces +3 added lines, -1 removed lines

@@ -43,9 +43,11 @@
 					// Previous/next page navigation.
 					twentyfourteen_paging_nav();
 
-				else :
+				else {
+					:
 					// If no content, include the "No posts found" template.
 					get_template_part( 'content', 'none' );
+				}
 
 				endif;
 			?>

src/wp-content/themes/twentyfourteen/inc/back-compat.php

Spacing +12 added lines, -12 removed lines

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

src/wp-content/themes/twentyfourteen/inc/custom-header.php

Spacing +12 added lines, -12 removed lines

@@ -35,7 +35,7 @@ 
 	 *                                          the Appearance > Header screen.
 	 * }
 	 */
-	add_theme_support( 'custom-header', apply_filters( 'twentyfourteen_custom_header_args', array(
+	add_theme_support('custom-header', apply_filters('twentyfourteen_custom_header_args', array(
 		'default-text-color'     => 'fff',
 		'width'                  => 1260,
 		'height'                 => 240,
@@ -43,11 +43,11 @@ 
 		'wp-head-callback'       => 'twentyfourteen_header_style',
 		'admin-head-callback'    => 'twentyfourteen_admin_header_style',
 		'admin-preview-callback' => 'twentyfourteen_admin_header_image',
-	) ) );
+	)));
 }
-add_action( 'after_setup_theme', 'twentyfourteen_custom_header_setup' );
+add_action('after_setup_theme', 'twentyfourteen_custom_header_setup');
 
-if ( ! function_exists( 'twentyfourteen_header_style' ) ) :
+if ( ! function_exists('twentyfourteen_header_style')) :
 /**
  * Styles the header image and text displayed on the blog
  *
@@ -58,7 +58,7 @@ 
 	$text_color = get_header_textcolor();
 
 	// If no custom color for text is set, let's bail.
-	if ( display_header_text() && $text_color === get_theme_support( 'custom-header', 'default-text-color' ) )
+	if (display_header_text() && $text_color === get_theme_support('custom-header', 'default-text-color'))
 		return;
 
 	// If we get this far, we have custom styles.
@@ -66,7 +66,7 @@ 
 	<style type="text/css" id="twentyfourteen-header-css">
 	<?php
 		// Has the text been hidden?
-		if ( ! display_header_text() ) :
+		if ( ! display_header_text()) :
 	?>
 		.site-title,
 		.site-description {
@@ -76,10 +76,10 @@ 
 		}
 	<?php
 		// 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 a {
-			color: #<?php echo esc_attr( $text_color ); ?>;
+			color: #<?php echo esc_attr($text_color); ?>;
 		}
 	<?php endif; ?>
 	</style>
@@ -88,7 +88,7 @@ 
 endif; // twentyfourteen_header_style
 
 
-if ( ! function_exists( 'twentyfourteen_admin_header_style' ) ) :
+if ( ! function_exists('twentyfourteen_admin_header_style')) :
 /**
  * Style the header image displayed on the Appearance > Header screen.
  *
@@ -126,7 +126,7 @@ 
 }
 endif; // twentyfourteen_admin_header_style
 
-if ( ! function_exists( 'twentyfourteen_admin_header_image' ) ) :
+if ( ! function_exists('twentyfourteen_admin_header_image')) :
 /**
  * Create the custom header image markup displayed on the Appearance > Header screen.
  *
@@ -137,10 +137,10 @@ 
 function twentyfourteen_admin_header_image() {
 ?>
 	<div id="headimg">
-		<?php if ( get_header_image() ) : ?>
+		<?php if (get_header_image()) : ?>
 		<img src="<?php header_image(); ?>" alt="">
 		<?php endif; ?>
-		<h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr( sprintf( 'color: #%s;', get_header_textcolor() ) ); ?>" onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
+		<h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr(sprintf('color: #%s;', get_header_textcolor())); ?>" onclick="return false;" href="<?php echo esc_url(home_url('/')); ?>" tabindex="-1"><?php bloginfo('name'); ?></a></h1>
 	</div>
 <?php
 }

Braces +3 added lines, -2 removed lines

@@ -58,8 +58,9 @@
 	$text_color = get_header_textcolor();
 
 	// If no custom color for text is set, let's bail.
-	if ( display_header_text() && $text_color === get_theme_support( 'custom-header', 'default-text-color' ) )
-		return;
+	if ( display_header_text() && $text_color === get_theme_support( 'custom-header', 'default-text-color' ) ) {
+			return;
+	}
 
 	// If we get this far, we have custom styles.
 	?>

src/wp-content/themes/twentyfourteen/inc/template-tags.php

Braces +8 added lines, -3 removed lines

@@ -87,8 +87,10 @@ 
 			<?php
 			if ( is_attachment() ) :
 				previous_post_link( '%link', __( '<span class="meta-nav">Published In</span>%title', 'twentyfourteen' ) );
-			else :
+			else {
+				:
 				previous_post_link( '%link', __( '<span class="meta-nav">Previous Post</span>%title', 'twentyfourteen' ) );
+			}
 				next_post_link( '%link', __( '<span class="meta-nav">Next Post</span>%title', 'twentyfourteen' ) );
 			endif;
 			?>
@@ -189,9 +191,12 @@ 
 	?>
 	</div>
 
-	<?php else : ?>
+	<?php else {
+	: ?>
 
-	<a class="post-thumbnail" href="<?php the_permalink(); ?>" aria-hidden="true">
+	<a class="post-thumbnail" href="<?php the_permalink();
+}
+?>" aria-hidden="true">
 	<?php
 		if ( ( ! is_active_sidebar( 'sidebar-2' ) || is_page_template( 'page-templates/full-width.php' ) ) ) {
 			the_post_thumbnail( 'twentyfourteen-full-width' );

Spacing +59 added lines, -59 removed lines

@@ -7,7 +7,7 @@ 
  * @since Twenty Fourteen 1.0
  */
 
-if ( ! function_exists( 'twentyfourteen_paging_nav' ) ) :
+if ( ! function_exists('twentyfourteen_paging_nav')) :
 /**
  * Display navigation to next/previous set of posts when applicable.
  *
@@ -20,42 +20,42 @@ 
 	global $wp_query, $wp_rewrite;
 
 	// Don't print empty markup if there's only one page.
-	if ( $wp_query->max_num_pages < 2 ) {
+	if ($wp_query->max_num_pages < 2) {
 		return;
 	}
 
-	$paged        = get_query_var( 'paged' ) ? intval( get_query_var( 'paged' ) ) : 1;
-	$pagenum_link = html_entity_decode( get_pagenum_link() );
+	$paged        = get_query_var('paged') ? intval(get_query_var('paged')) : 1;
+	$pagenum_link = html_entity_decode(get_pagenum_link());
 	$query_args   = array();
-	$url_parts    = explode( '?', $pagenum_link );
+	$url_parts    = explode('?', $pagenum_link);
 
-	if ( isset( $url_parts[1] ) ) {
-		wp_parse_str( $url_parts[1], $query_args );
+	if (isset($url_parts[1])) {
+		wp_parse_str($url_parts[1], $query_args);
 	}
 
-	$pagenum_link = remove_query_arg( array_keys( $query_args ), $pagenum_link );
-	$pagenum_link = trailingslashit( $pagenum_link ) . '%_%';
+	$pagenum_link = remove_query_arg(array_keys($query_args), $pagenum_link);
+	$pagenum_link = trailingslashit($pagenum_link).'%_%';
 
-	$format  = $wp_rewrite->using_index_permalinks() && ! strpos( $pagenum_link, 'index.php' ) ? 'index.php/' : '';
-	$format .= $wp_rewrite->using_permalinks() ? user_trailingslashit( $wp_rewrite->pagination_base . '/%#%', 'paged' ) : '?paged=%#%';
+	$format  = $wp_rewrite->using_index_permalinks() && ! strpos($pagenum_link, 'index.php') ? 'index.php/' : '';
+	$format .= $wp_rewrite->using_permalinks() ? user_trailingslashit($wp_rewrite->pagination_base.'/%#%', 'paged') : '?paged=%#%';
 
 	// Set up paginated links.
-	$links = paginate_links( array(
+	$links = paginate_links(array(
 		'base'     => $pagenum_link,
 		'format'   => $format,
 		'total'    => $wp_query->max_num_pages,
 		'current'  => $paged,
 		'mid_size' => 1,
-		'add_args' => array_map( 'urlencode', $query_args ),
-		'prev_text' => __( '&larr; Previous', 'twentyfourteen' ),
-		'next_text' => __( 'Next &rarr;', 'twentyfourteen' ),
-	) );
+		'add_args' => array_map('urlencode', $query_args),
+		'prev_text' => __('&larr; Previous', 'twentyfourteen'),
+		'next_text' => __('Next &rarr;', 'twentyfourteen'),
+	));
 
-	if ( $links ) :
+	if ($links) :
 
 	?>
 	<nav class="navigation paging-navigation" role="navigation">
-		<h1 class="screen-reader-text"><?php _e( 'Posts navigation', 'twentyfourteen' ); ?></h1>
+		<h1 class="screen-reader-text"><?php _e('Posts navigation', 'twentyfourteen'); ?></h1>
 		<div class="pagination loop-pagination">
 			<?php echo $links; ?>
 		</div><!-- .pagination -->
@@ -65,7 +65,7 @@ 
 }
 endif;
 
-if ( ! function_exists( 'twentyfourteen_post_nav' ) ) :
+if ( ! function_exists('twentyfourteen_post_nav')) :
 /**
  * Display navigation to next/previous post when applicable.
  *
@@ -73,23 +73,23 @@ 
  */
 function twentyfourteen_post_nav() {
 	// Don't print empty markup if there's nowhere to navigate.
-	$previous = ( is_attachment() ) ? get_post( get_post()->post_parent ) : get_adjacent_post( false, '', true );
-	$next     = get_adjacent_post( false, '', false );
+	$previous = (is_attachment()) ? get_post(get_post()->post_parent) : get_adjacent_post(false, '', true);
+	$next     = get_adjacent_post(false, '', false);
 
-	if ( ! $next && ! $previous ) {
+	if ( ! $next && ! $previous) {
 		return;
 	}
 
 	?>
 	<nav class="navigation post-navigation" role="navigation">
-		<h1 class="screen-reader-text"><?php _e( 'Post navigation', 'twentyfourteen' ); ?></h1>
+		<h1 class="screen-reader-text"><?php _e('Post navigation', 'twentyfourteen'); ?></h1>
 		<div class="nav-links">
 			<?php
-			if ( is_attachment() ) :
-				previous_post_link( '%link', __( '<span class="meta-nav">Published In</span>%title', 'twentyfourteen' ) );
+			if (is_attachment()) :
+				previous_post_link('%link', __('<span class="meta-nav">Published In</span>%title', 'twentyfourteen'));
 			else :
-				previous_post_link( '%link', __( '<span class="meta-nav">Previous Post</span>%title', 'twentyfourteen' ) );
-				next_post_link( '%link', __( '<span class="meta-nav">Next Post</span>%title', 'twentyfourteen' ) );
+				previous_post_link('%link', __('<span class="meta-nav">Previous Post</span>%title', 'twentyfourteen'));
+				next_post_link('%link', __('<span class="meta-nav">Next Post</span>%title', 'twentyfourteen'));
 			endif;
 			?>
 		</div><!-- .nav-links -->
@@ -98,23 +98,23 @@ 
 }
 endif;
 
-if ( ! function_exists( 'twentyfourteen_posted_on' ) ) :
+if ( ! function_exists('twentyfourteen_posted_on')) :
 /**
  * Print HTML with meta information for the current post-date/time and author.
  *
  * @since Twenty Fourteen 1.0
  */
 function twentyfourteen_posted_on() {
-	if ( is_sticky() && is_home() && ! is_paged() ) {
-		echo '<span class="featured-post">' . __( 'Sticky', 'twentyfourteen' ) . '</span>';
+	if (is_sticky() && is_home() && ! is_paged()) {
+		echo '<span class="featured-post">'.__('Sticky', 'twentyfourteen').'</span>';
 	}
 
 	// Set up and print post meta information.
-	printf( '<span class="entry-date"><a href="%1$s" rel="bookmark"><time class="entry-date" datetime="%2$s">%3$s</time></a></span> <span class="byline"><span class="author vcard"><a class="url fn n" href="%4$s" rel="author">%5$s</a></span></span>',
-		esc_url( get_permalink() ),
-		esc_attr( get_the_date( 'c' ) ),
-		esc_html( get_the_date() ),
-		esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
+	printf('<span class="entry-date"><a href="%1$s" rel="bookmark"><time class="entry-date" datetime="%2$s">%3$s</time></a></span> <span class="byline"><span class="author vcard"><a class="url fn n" href="%4$s" rel="author">%5$s</a></span></span>',
+		esc_url(get_permalink()),
+		esc_attr(get_the_date('c')),
+		esc_html(get_the_date()),
+		esc_url(get_author_posts_url(get_the_author_meta('ID'))),
 		get_the_author()
 	);
 }
@@ -128,19 +128,19 @@ 
  * @return boolean true if blog has more than 1 category
  */
 function twentyfourteen_categorized_blog() {
-	if ( false === ( $all_the_cool_cats = get_transient( 'twentyfourteen_category_count' ) ) ) {
+	if (false === ($all_the_cool_cats = get_transient('twentyfourteen_category_count'))) {
 		// Create an array of all the categories that are attached to posts
-		$all_the_cool_cats = get_categories( array(
+		$all_the_cool_cats = get_categories(array(
 			'hide_empty' => 1,
-		) );
+		));
 
 		// Count the number of categories that are attached to the posts
-		$all_the_cool_cats = count( $all_the_cool_cats );
+		$all_the_cool_cats = count($all_the_cool_cats);
 
-		set_transient( 'twentyfourteen_category_count', $all_the_cool_cats );
+		set_transient('twentyfourteen_category_count', $all_the_cool_cats);
 	}
 
-	if ( $all_the_cool_cats > 1 || is_preview() ) {
+	if ($all_the_cool_cats > 1 || is_preview()) {
 		// This blog has more than 1 category so twentyfourteen_categorized_blog should return true
 		return true;
 	} else {
@@ -156,12 +156,12 @@ 
  */
 function twentyfourteen_category_transient_flusher() {
 	// Like, beat it. Dig?
-	delete_transient( 'twentyfourteen_category_count' );
+	delete_transient('twentyfourteen_category_count');
 }
-add_action( 'edit_category', 'twentyfourteen_category_transient_flusher' );
-add_action( 'save_post',     'twentyfourteen_category_transient_flusher' );
+add_action('edit_category', 'twentyfourteen_category_transient_flusher');
+add_action('save_post', 'twentyfourteen_category_transient_flusher');
 
-if ( ! function_exists( 'twentyfourteen_post_thumbnail' ) ) :
+if ( ! function_exists('twentyfourteen_post_thumbnail')) :
 /**
  * Display an optional post thumbnail.
  *
@@ -172,17 +172,17 @@ 
  * @since Twenty Fourteen 1.4 Was made 'pluggable', or overridable.
  */
 function twentyfourteen_post_thumbnail() {
-	if ( post_password_required() || is_attachment() || ! has_post_thumbnail() ) {
+	if (post_password_required() || is_attachment() || ! has_post_thumbnail()) {
 		return;
 	}
 
-	if ( is_singular() ) :
+	if (is_singular()) :
 	?>
 
 	<div class="post-thumbnail">
 	<?php
-		if ( ( ! is_active_sidebar( 'sidebar-2' ) || is_page_template( 'page-templates/full-width.php' ) ) ) {
-			the_post_thumbnail( 'twentyfourteen-full-width' );
+		if (( ! is_active_sidebar('sidebar-2') || is_page_template('page-templates/full-width.php'))) {
+			the_post_thumbnail('twentyfourteen-full-width');
 		} else {
 			the_post_thumbnail();
 		}
@@ -193,10 +193,10 @@ 
 
 	<a class="post-thumbnail" href="<?php the_permalink(); ?>" aria-hidden="true">
 	<?php
-		if ( ( ! is_active_sidebar( 'sidebar-2' ) || is_page_template( 'page-templates/full-width.php' ) ) ) {
-			the_post_thumbnail( 'twentyfourteen-full-width' );
+		if (( ! is_active_sidebar('sidebar-2') || is_page_template('page-templates/full-width.php'))) {
+			the_post_thumbnail('twentyfourteen-full-width');
 		} else {
-			the_post_thumbnail( 'post-thumbnail', array( 'alt' => get_the_title() ) );
+			the_post_thumbnail('post-thumbnail', array('alt' => get_the_title()));
 		}
 	?>
 	</a>
@@ -205,7 +205,7 @@ 
 }
 endif;
 
-if ( ! function_exists( 'twentyfourteen_excerpt_more' ) && ! is_admin() ) :
+if ( ! function_exists('twentyfourteen_excerpt_more') && ! is_admin()) :
 /**
  * Replaces "[...]" (appended to automatically generated excerpts) with ...
  * and a Continue reading link.
@@ -215,13 +215,13 @@ 
  * @param string $more Default Read More excerpt link.
  * @return string Filtered Read More excerpt link.
  */
-function twentyfourteen_excerpt_more( $more ) {
-	$link = sprintf( '<a href="%1$s" class="more-link">%2$s</a>',
-		esc_url( get_permalink( get_the_ID() ) ),
+function twentyfourteen_excerpt_more($more) {
+	$link = sprintf('<a href="%1$s" class="more-link">%2$s</a>',
+		esc_url(get_permalink(get_the_ID())),
 			/* translators: %s: Name of current post */
-			sprintf( __( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ), '<span class="screen-reader-text">' . get_the_title( get_the_ID() ) . '</span>' )
+			sprintf(__('Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen'), '<span class="screen-reader-text">'.get_the_title(get_the_ID()).'</span>')
 		);
-	return ' &hellip; ' . $link;
+	return ' &hellip; '.$link;
 }
-add_filter( 'excerpt_more', 'twentyfourteen_excerpt_more' );
+add_filter('excerpt_more', 'twentyfourteen_excerpt_more');
 endif;

src/wp-content/themes/twentyfourteen/inc/widgets.php

Braces +9 added lines, -4 removed lines

@@ -125,12 +125,15 @@ 
 
 								if ( post_password_required() ) :
 									the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) );
-								else :
+								else {
+									:
 									$images = array();
+								}
 
 									$galleries = get_post_galleries( get_the_ID(), false );
-									if ( isset( $galleries[0]['ids'] ) )
-										$images = explode( ',', $galleries[0]['ids'] );
+									if ( isset( $galleries[0]['ids'] ) ) {
+																			$images = explode( ',', $galleries[0]['ids'] );
+									}
 
 									if ( ! $images ) :
 										$images = get_posts( array(
@@ -168,8 +171,10 @@ 
 						<?php
 								endif;
 
-							else :
+							else {
+								:
 								the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) );
+							}
 							endif;
 						?>
 					</div><!-- .entry-content -->

Spacing +84 added lines, -84 removed lines

@@ -21,7 +21,7 @@ 
 	 *
 	 * @var array
 	 */
-	private $formats = array( 'aside', 'image', 'video', 'audio', 'quote', 'link', 'gallery' );
+	private $formats = array('aside', 'image', 'video', 'audio', 'quote', 'link', 'gallery');
 
 	/**
 	 * Constructor.
@@ -31,14 +31,14 @@ 
 	 * @return Twenty_Fourteen_Ephemera_Widget
 	 */
 	public function __construct() {
-		parent::__construct( 'widget_twentyfourteen_ephemera', __( 'Twenty Fourteen Ephemera', 'twentyfourteen' ), array(
+		parent::__construct('widget_twentyfourteen_ephemera', __('Twenty Fourteen Ephemera', 'twentyfourteen'), array(
 			'classname'   => 'widget_twentyfourteen_ephemera',
-			'description' => __( 'Use this widget to list your recent Aside, Quote, Video, Audio, Image, Gallery, and Link posts.', 'twentyfourteen' ),
+			'description' => __('Use this widget to list your recent Aside, Quote, Video, Audio, Image, Gallery, and Link posts.', 'twentyfourteen'),
 			'customize_selective_refresh' => true,
-		) );
+		));
 
-		if ( is_active_widget( false, false, $this->id_base ) || is_customize_preview() ) {
-			add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+		if (is_active_widget(false, false, $this->id_base) || is_customize_preview()) {
+			add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'));
 		}
 	}
 
@@ -49,12 +49,12 @@ 
 	 */
 	public function enqueue_scripts() {
 		/** This filter is documented in wp-includes/media.php */
-		$audio_library = apply_filters( 'wp_audio_shortcode_library', 'mediaelement' );
+		$audio_library = apply_filters('wp_audio_shortcode_library', 'mediaelement');
 		/** This filter is documented in wp-includes/media.php */
-		$video_library = apply_filters( 'wp_video_shortcode_library', 'mediaelement' );
-		if ( in_array( 'mediaelement', array( $video_library, $audio_library ), true ) ) {
-			wp_enqueue_style( 'wp-mediaelement' );
-			wp_enqueue_script( 'wp-mediaelement' );
+		$video_library = apply_filters('wp_video_shortcode_library', 'mediaelement');
+		if (in_array('mediaelement', array($video_library, $audio_library), true)) {
+			wp_enqueue_style('wp-mediaelement');
+			wp_enqueue_script('wp-mediaelement');
 		}
 	}
 
@@ -67,73 +67,73 @@ 
 	 * @param array $args     An array of standard parameters for widgets in this theme.
 	 * @param array $instance An array of settings for this widget instance.
 	 */
-	public function widget( $args, $instance ) {
-		$format = isset( $instance['format'] ) && in_array( $instance['format'], $this->formats ) ? $instance['format'] : 'aside';
+	public function widget($args, $instance) {
+		$format = isset($instance['format']) && in_array($instance['format'], $this->formats) ? $instance['format'] : 'aside';
 
-		switch ( $format ) {
+		switch ($format) {
 			case 'image':
-				$format_string      = __( 'Images', 'twentyfourteen' );
-				$format_string_more = __( 'More images', 'twentyfourteen' );
+				$format_string      = __('Images', 'twentyfourteen');
+				$format_string_more = __('More images', 'twentyfourteen');
 				break;
 			case 'video':
-				$format_string      = __( 'Videos', 'twentyfourteen' );
-				$format_string_more = __( 'More videos', 'twentyfourteen' );
+				$format_string      = __('Videos', 'twentyfourteen');
+				$format_string_more = __('More videos', 'twentyfourteen');
 				break;
 			case 'audio':
-				$format_string      = __( 'Audio', 'twentyfourteen' );
-				$format_string_more = __( 'More audio', 'twentyfourteen' );
+				$format_string      = __('Audio', 'twentyfourteen');
+				$format_string_more = __('More audio', 'twentyfourteen');
 				break;
 			case 'quote':
-				$format_string      = __( 'Quotes', 'twentyfourteen' );
-				$format_string_more = __( 'More quotes', 'twentyfourteen' );
+				$format_string      = __('Quotes', 'twentyfourteen');
+				$format_string_more = __('More quotes', 'twentyfourteen');
 				break;
 			case 'link':
-				$format_string      = __( 'Links', 'twentyfourteen' );
-				$format_string_more = __( 'More links', 'twentyfourteen' );
+				$format_string      = __('Links', 'twentyfourteen');
+				$format_string_more = __('More links', 'twentyfourteen');
 				break;
 			case 'gallery':
-				$format_string      = __( 'Galleries', 'twentyfourteen' );
-				$format_string_more = __( 'More galleries', 'twentyfourteen' );
+				$format_string      = __('Galleries', 'twentyfourteen');
+				$format_string_more = __('More galleries', 'twentyfourteen');
 				break;
 			case 'aside':
 			default:
-				$format_string      = __( 'Asides', 'twentyfourteen' );
-				$format_string_more = __( 'More asides', 'twentyfourteen' );
+				$format_string      = __('Asides', 'twentyfourteen');
+				$format_string_more = __('More asides', 'twentyfourteen');
 				break;
 		}
 
-		$number = empty( $instance['number'] ) ? 2 : absint( $instance['number'] );
-		$title  = apply_filters( 'widget_title', empty( $instance['title'] ) ? $format_string : $instance['title'], $instance, $this->id_base );
+		$number = empty($instance['number']) ? 2 : absint($instance['number']);
+		$title  = apply_filters('widget_title', empty($instance['title']) ? $format_string : $instance['title'], $instance, $this->id_base);
 
-		$ephemera = new WP_Query( array(
+		$ephemera = new WP_Query(array(
 			'order'          => 'DESC',
 			'posts_per_page' => $number,
 			'no_found_rows'  => true,
 			'post_status'    => 'publish',
-			'post__not_in'   => get_option( 'sticky_posts' ),
+			'post__not_in'   => get_option('sticky_posts'),
 			'tax_query'      => array(
 				array(
 					'taxonomy' => 'post_format',
-					'terms'    => array( "post-format-$format" ),
+					'terms'    => array("post-format-$format"),
 					'field'    => 'slug',
 					'operator' => 'IN',
 				),
 			),
-		) );
+		));
 
-		if ( $ephemera->have_posts() ) :
+		if ($ephemera->have_posts()) :
 			$tmp_content_width = $GLOBALS['content_width'];
 			$GLOBALS['content_width'] = 306;
 
 			echo $args['before_widget'];
 			?>
-			<h1 class="widget-title <?php echo esc_attr( $format ); ?>">
-				<a class="entry-format" href="<?php echo esc_url( get_post_format_link( $format ) ); ?>"><?php echo esc_html( $title ); ?></a>
+			<h1 class="widget-title <?php echo esc_attr($format); ?>">
+				<a class="entry-format" href="<?php echo esc_url(get_post_format_link($format)); ?>"><?php echo esc_html($title); ?></a>
 			</h1>
 			<ol>
 
 				<?php
-					while ( $ephemera->have_posts() ) :
+					while ($ephemera->have_posts()) :
 						$ephemera->the_post();
 						$tmp_more = $GLOBALS['more'];
 						$GLOBALS['more'] = 0;
@@ -142,19 +142,19 @@ 
 				<article <?php post_class(); ?>>
 					<div class="entry-content">
 						<?php
-							if ( has_post_format( 'gallery' ) ) :
+							if (has_post_format('gallery')) :
 
-								if ( post_password_required() ) :
-									the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) );
+								if (post_password_required()) :
+									the_content(__('Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen'));
 								else :
 									$images = array();
 
-									$galleries = get_post_galleries( get_the_ID(), false );
-									if ( isset( $galleries[0]['ids'] ) )
-										$images = explode( ',', $galleries[0]['ids'] );
+									$galleries = get_post_galleries(get_the_ID(), false);
+									if (isset($galleries[0]['ids']))
+										$images = explode(',', $galleries[0]['ids']);
 
-									if ( ! $images ) :
-										$images = get_posts( array(
+									if ( ! $images) :
+										$images = get_posts(array(
 											'fields'         => 'ids',
 											'numberposts'    => -1,
 											'order'          => 'ASC',
@@ -162,27 +162,27 @@ 
 											'post_mime_type' => 'image',
 											'post_parent'    => get_the_ID(),
 											'post_type'      => 'attachment',
-										) );
+										));
 									endif;
 
-									$total_images = count( $images );
+									$total_images = count($images);
 
-									if ( has_post_thumbnail() ) :
+									if (has_post_thumbnail()) :
 										$post_thumbnail = get_the_post_thumbnail();
-									elseif ( $total_images > 0 ) :
-										$image          = reset( $images );
-										$post_thumbnail = wp_get_attachment_image( $image, 'post-thumbnail' );
+									elseif ($total_images > 0) :
+										$image          = reset($images);
+										$post_thumbnail = wp_get_attachment_image($image, 'post-thumbnail');
 									endif;
 
-									if ( ! empty ( $post_thumbnail ) ) :
+									if ( ! empty ($post_thumbnail)) :
 						?>
 						<a href="<?php the_permalink(); ?>"><?php echo $post_thumbnail; ?></a>
 						<?php endif; ?>
 						<p class="wp-caption-text">
 							<?php
-								printf( _n( 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photo</a>.', 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photos</a>.', $total_images, 'twentyfourteen' ),
-									esc_url( get_permalink() ),
-									number_format_i18n( $total_images )
+								printf(_n('This gallery contains <a href="%1$s" rel="bookmark">%2$s photo</a>.', 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photos</a>.', $total_images, 'twentyfourteen'),
+									esc_url(get_permalink()),
+									number_format_i18n($total_images)
 								);
 							?>
 						</p>
@@ -190,7 +190,7 @@ 
 								endif;
 
 							else :
-								the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) );
+								the_content(__('Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen'));
 							endif;
 						?>
 					</div><!-- .entry-content -->
@@ -198,21 +198,21 @@ 
 					<header class="entry-header">
 						<div class="entry-meta">
 							<?php
-								if ( ! has_post_format( 'link' ) ) :
-									the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
+								if ( ! has_post_format('link')) :
+									the_title('<h1 class="entry-title"><a href="'.esc_url(get_permalink()).'" rel="bookmark">', '</a></h1>');
 								endif;
 
-								printf( '<span class="entry-date"><a href="%1$s" rel="bookmark"><time class="entry-date" datetime="%2$s">%3$s</time></a></span> <span class="byline"><span class="author vcard"><a class="url fn n" href="%4$s" rel="author">%5$s</a></span></span>',
-									esc_url( get_permalink() ),
-									esc_attr( get_the_date( 'c' ) ),
-									esc_html( get_the_date() ),
-									esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
+								printf('<span class="entry-date"><a href="%1$s" rel="bookmark"><time class="entry-date" datetime="%2$s">%3$s</time></a></span> <span class="byline"><span class="author vcard"><a class="url fn n" href="%4$s" rel="author">%5$s</a></span></span>',
+									esc_url(get_permalink()),
+									esc_attr(get_the_date('c')),
+									esc_html(get_the_date()),
+									esc_url(get_author_posts_url(get_the_author_meta('ID'))),
 									get_the_author()
 								);
 
-								if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) :
+								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>
+							<span class="comments-link"><?php comments_popup_link(__('Leave a comment', 'twentyfourteen'), __('1 Comment', 'twentyfourteen'), __('% Comments', 'twentyfourteen')); ?></span>
 							<?php endif; ?>
 						</div><!-- .entry-meta -->
 					</header><!-- .entry-header -->
@@ -221,10 +221,10 @@ 
 				<?php endwhile; ?>
 
 			</ol>
-			<a class="post-format-archive-link" href="<?php echo esc_url( get_post_format_link( $format ) ); ?>">
+			<a class="post-format-archive-link" href="<?php echo esc_url(get_post_format_link($format)); ?>">
 				<?php
 					/* translators: used with More archives link */
-					printf( __( '%s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ), $format_string_more );
+					printf(__('%s <span class="meta-nav">&rarr;</span>', 'twentyfourteen'), $format_string_more);
 				?>
 			</a>
 			<?php
@@ -251,10 +251,10 @@ 
 	 * @param array $instance     Original widget instance.
 	 * @return array Updated widget instance.
 	 */
-	function update( $new_instance, $instance ) {
-		$instance['title']  = strip_tags( $new_instance['title'] );
-		$instance['number'] = empty( $new_instance['number'] ) ? 2 : absint( $new_instance['number'] );
-		if ( in_array( $new_instance['format'], $this->formats ) ) {
+	function update($new_instance, $instance) {
+		$instance['title']  = strip_tags($new_instance['title']);
+		$instance['number'] = empty($new_instance['number']) ? 2 : absint($new_instance['number']);
+		if (in_array($new_instance['format'], $this->formats)) {
 			$instance['format'] = $new_instance['format'];
 		}
 
@@ -268,21 +268,21 @@ 
 	 *
 	 * @param array $instance
 	 */
-	function form( $instance ) {
-		$title  = empty( $instance['title'] ) ? '' : esc_attr( $instance['title'] );
-		$number = empty( $instance['number'] ) ? 2 : absint( $instance['number'] );
-		$format = isset( $instance['format'] ) && in_array( $instance['format'], $this->formats ) ? $instance['format'] : 'aside';
+	function form($instance) {
+		$title  = empty($instance['title']) ? '' : esc_attr($instance['title']);
+		$number = empty($instance['number']) ? 2 : absint($instance['number']);
+		$format = isset($instance['format']) && in_array($instance['format'], $this->formats) ? $instance['format'] : 'aside';
 		?>
-			<p><label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title:', 'twentyfourteen' ); ?></label>
-			<input id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" class="widefat" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>"></p>
+			<p><label for="<?php echo esc_attr($this->get_field_id('title')); ?>"><?php _e('Title:', 'twentyfourteen'); ?></label>
+			<input id="<?php echo esc_attr($this->get_field_id('title')); ?>" class="widefat" name="<?php echo esc_attr($this->get_field_name('title')); ?>" type="text" value="<?php echo esc_attr($title); ?>"></p>
 
-			<p><label for="<?php echo esc_attr( $this->get_field_id( 'number' ) ); ?>"><?php _e( 'Number of posts to show:', 'twentyfourteen' ); ?></label>
-			<input id="<?php echo esc_attr( $this->get_field_id( 'number' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'number' ) ); ?>" type="text" value="<?php echo esc_attr( $number ); ?>" size="3"></p>
+			<p><label for="<?php echo esc_attr($this->get_field_id('number')); ?>"><?php _e('Number of posts to show:', 'twentyfourteen'); ?></label>
+			<input id="<?php echo esc_attr($this->get_field_id('number')); ?>" name="<?php echo esc_attr($this->get_field_name('number')); ?>" type="text" value="<?php echo esc_attr($number); ?>" size="3"></p>
 
-			<p><label for="<?php echo esc_attr( $this->get_field_id( 'format' ) ); ?>"><?php _e( 'Post format to show:', 'twentyfourteen' ); ?></label>
-			<select id="<?php echo esc_attr( $this->get_field_id( 'format' ) ); ?>" class="widefat" name="<?php echo esc_attr( $this->get_field_name( 'format' ) ); ?>">
-				<?php foreach ( $this->formats as $slug ) : ?>
-				<option value="<?php echo esc_attr( $slug ); ?>"<?php selected( $format, $slug ); ?>><?php echo esc_html( get_post_format_string( $slug ) ); ?></option>
+			<p><label for="<?php echo esc_attr($this->get_field_id('format')); ?>"><?php _e('Post format to show:', 'twentyfourteen'); ?></label>
+			<select id="<?php echo esc_attr($this->get_field_id('format')); ?>" class="widefat" name="<?php echo esc_attr($this->get_field_name('format')); ?>">
+				<?php foreach ($this->formats as $slug) : ?>
+				<option value="<?php echo esc_attr($slug); ?>"<?php selected($format, $slug); ?>><?php echo esc_html(get_post_format_string($slug)); ?></option>
 				<?php endforeach; ?>
 			</select>
 		<?php