Merge pull request #41 from ScottSmith95/3.0.8

Decode 3.0.8

.gitattributes

@@ -0,0 +1,4 @@
+.gitignore              export-ignore
+.gitattributes          export-ignore
+.travis.yml             export-ignore
+codesniffer.ruleset.xml export-ignore

.gitignore

@@ -1,16 +1,16 @@
-
 config.codekit
-
 node_modules/
 
 # Built Files
 style.css
 editor-style.css
+
 styles/*.css
-styles/*.map
+styles/**/*.map
 styles/src/.sass-cache/
-styles/src/reset/_normalize.scss
+
 scripts/*.js
-scripts/srcmaps/
+scripts/**/*.map
 scripts/src/modernizr.js
+
 docs/*.html

.travis.yml

@@ -28,12 +28,12 @@ env:
     - WP_VERSION=master WP_MULTISITE=1
     # WordPress 4.1
     # @link https://github.com/WordPress/WordPress/tree/4.1-branch
-    - WP_VERSION=4.1 WP_MULTISITE=0
-    - WP_VERSION=4.1 WP_MULTISITE=1
+    - WP_VERSION=4.2 WP_MULTISITE=0
+    - WP_VERSION=4.2 WP_MULTISITE=1
     # WordPress 4.0
     # @link https://github.com/WordPress/WordPress/tree/4.0-branch
-    - WP_VERSION=4.0 WP_MULTISITE=0
-    - WP_VERSION=4.0 WP_MULTISITE=1
+    - WP_VERSION=4.1 WP_MULTISITE=0
+    - WP_VERSION=4.1 WP_MULTISITE=1
 
 # Declare 5.6 beta in test matrix.
 # @link https://buddypress.trac.wordpress.org/ticket/5620
@@ -46,12 +46,15 @@ matrix:
         - php: 5.6
     fast_finish: true
 
+before_install:
+ - npm install -g npm # Update npm to latest version.
+
 # Install devDependencies and build files with Grunt.
 install:
   - npm install
   - npm install # Do it again because it goes wrong often enough to make builds error.
-  - npm install -g grunt-cli
-  - grunt build
+  - npm install -g gulp
+  - gulp build
 
 # Use this to prepare the system to install prerequisites or dependencies.
 # e.g. sudo apt-get update.

404.php

@@ -12,11 +12,11 @@
 
 			<section class="error-404 not-found">
 				<header class="page-header">
-					<h1 class="page-title"><?php _e( 'Oops! That page can&rsquo;t be found.', 'decode' ); ?></h1>
+					<h1 class="page-title"><?php esc_html_e( 'Oops! That page can&rsquo;t be found.', 'decode' ); ?></h1>
 				</header><!-- .page-header -->
 
 				<div class="page-content">
-					<p><?php _e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', 'decode' ); ?></p>
+					<p><?php esc_html_e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', 'decode' ); ?></p>
 
 					<?php get_search_form(); ?>
 
@@ -29,7 +29,7 @@
 
 					<?php if ( decode_categorized_blog() ) : // Only show the widget if site has multiple categories. ?>
 					<div class="widget widget_categories">
-						<h2 class="widgettitle"><?php _e( 'Most Used Categories', 'decode' ); ?></h2>
+						<h2 class="widgettitle"><?php esc_html_e( 'Most Used Categories', 'decode' ); ?></h2>
 						<ul>
 						<?php
 							wp_list_categories( array(

archive.php

@@ -2,7 +2,7 @@
 /**
  * The template for displaying archive pages.
  *
- * Learn more: http://codex.wordpress.org/Template_Hierarchy
+ * Learn more: https://codex.wordpress.org/Template_Hierarchy
  *
  * @package Decode
  */

author.php

@@ -2,7 +2,7 @@
 /**
  * The template for displaying author pages.
  *
- * Learn more: http://codex.wordpress.org/Template_Hierarchy
+ * Learn more: https://codex.wordpress.org/Template_Hierarchy
  *
  * @package Decode
  */

codesniffer.ruleset.xml

@@ -7,8 +7,6 @@
 
 	<!-- Include the WordPress ruleset, with exclusions. -->
 	<rule ref="WordPress">
-		<exclude name="WordPress.XSS.EscapeOutput" />
-		<exclude name="WordPress.WhiteSpace.ScopeIndent.Incorrect" />
-		<exclude name="WordPress.VIP.PostsPerPage.posts_per_page" />
+
 	</rule>
 </ruleset>

comments.php

@@ -31,7 +31,7 @@
 
 		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
 		<nav id="comment-nav-below" class="navigation comment-navigation" role="navigation">
-			<h2 class="screen-reader-text"><?php _e( 'Comment navigation', 'decode' ); ?></h2>
+			<h2 class="screen-reader-text"><?php esc_html_e( 'Comment navigation', 'decode' ); ?></h2>
 			<div class="nav-links">
 
 				<div class="nav-previous"><?php previous_comments_link( __( 'Older Comments', 'decode' ) ); ?></div>
@@ -55,7 +55,7 @@
 
 		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
 		<nav id="comment-nav-below" class="navigation comment-navigation" role="navigation">
-			<h2 class="screen-reader-text"><?php _e( 'Comment navigation', 'decode' ); ?></h2>
+			<h2 class="screen-reader-text"><?php esc_html_e( 'Comment navigation', 'decode' ); ?></h2>
 			<div class="nav-links">
 
 				<div class="nav-previous"><?php previous_comments_link( __( 'Older Comments', 'decode' ) ); ?></div>
@@ -71,7 +71,7 @@
 		// If comments are closed and there are comments, let's leave a little note, shall we?
 		if ( ! comments_open() && '0' != get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
 	?>
-		<p class="no-comments"><?php _e( 'Comments are closed.', 'decode' ); ?></p>
+		<p class="no-comments"><?php esc_html_e( 'Comments are closed.', 'decode' ); ?></p>
 	<?php endif; ?>
 
 	<?php

content-excerpt.php

@@ -30,7 +30,7 @@
 	</div><!-- .entry-summary -->
 
 	<footer class="entry-footer">
-		<a class="read-more-link" href="<?php echo get_permalink(); ?>"><?php _e( 'Read More&hellip;', 'decode' ); ?></a>
+		<a class="read-more-link" href="<?php echo get_permalink(); ?>"><?php esc_html_e( 'Read More&hellip;', 'decode' ); ?></a>
 
 		<?php edit_post_link( __( 'Edit', 'decode' ), '<div class="edit-link">', '</div>' ); ?>
 

content-link.php

@@ -42,7 +42,7 @@
 				<p class="tags"><?php the_tags( __( 'Tagged as: ', 'decode' ),', ' ); ?></p>
 			<?php endif; ?>
 			<?php if ( get_theme_mod( 'show_categories', false ) == true ) : ?>
-				<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode' ) . the_category( ', ' ); ?></p>
+				<p class="categories"><?php esc_html_e( 'Categorized in&#58; ', 'decode' ) . the_category( ', ' ); ?></p>
 			<?php endif; ?>
 			<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'below' ) : ?>
 				<p class="date"><?php decode_posted_on(); ?></p>

content-none.php

@@ -2,30 +2,30 @@
 /**
  * The template part for displaying a message that posts cannot be found.
  *
- * Learn more: http://codex.wordpress.org/Template_Hierarchy
+ * Learn more: https://codex.wordpress.org/Template_Hierarchy
  *
  * @package Decode
  */
 ?>
 
 <section class="no-results not-found">
 	<header class="page-header">
-		<h1 class="page-title"><?php _e( 'Nothing Found', 'decode' ); ?></h1>
+		<h1 class="page-title"><?php esc_html_e( 'Nothing Found', 'decode' ); ?></h1>
 	</header><!-- .page-header -->
 
 	<div class="page-content">
 		<?php if ( is_home() && current_user_can( 'publish_posts' ) ) : ?>
 
-			<p><?php printf( __( 'Ready to publish your first post? <a href="%1$s">Get started here</a>.', 'decode' ), admin_url( 'post-new.php' ) ); ?></p>
+			<p><?php printf( esc_html__( 'Ready to publish your first post? <a href="%1$s">Get started here</a>.', 'decode' ), admin_url( 'post-new.php' ) ); ?></p>
 
 		<?php elseif ( is_search() ) : ?>
 
-			<p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'decode' ); ?></p>
+			<p><?php esc_html_e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'decode' ); ?></p>
 			<?php get_search_form(); ?>
 
 		<?php else : ?>
 
-			<p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'decode' ); ?></p>
+			<p><?php esc_html_e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'decode' ); ?></p>
 			<?php get_search_form(); ?>
 
 		<?php endif; ?>

content-quote.php

@@ -29,7 +29,7 @@
 				<p class="tags"><?php the_tags( __( 'Tagged as: ', 'decode' ),', ' ); ?></p>
 			<?php endif; ?>
 			<?php if ( get_theme_mod( 'show_categories', false ) == true ) : ?>
-				<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode' )  . the_category( ', ' ); ?></p>
+				<p class="categories"><?php esc_html_e( 'Categorized in&#58; ', 'decode' )  . the_category( ', ' ); ?></p>
 			<?php endif; ?>
 			<p class="date"><?php decode_posted_on(); ?></p>
 		</div>

content-single.php

@@ -23,7 +23,7 @@
 
 			<div class="entry-meta">
 				<p class="tags"><?php the_tags( __( 'Tagged as: ', 'decode' ),', ' ); ?></p>
-				<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode' ) . the_category( ', ' ); ?></p>
+				<p class="categories"><?php esc_html_e( 'Categorized in&#58; ', 'decode' ) . the_category( ', ' ); ?></p>
 				<p class="date"><?php decode_posted_on(); ?></p>
 			</div>
 		</footer><!-- .entry-footer -->
@@ -63,7 +63,7 @@
 
 			<div class="entry-meta">
 				<p class="tags"><?php the_tags( __( 'Tagged as: ', 'decode' ),', ' ); ?></p>
-				<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode' ) . the_category( ', ' ); ?></p>
+				<p class="categories"><?php esc_html_e( 'Categorized in&#58; ', 'decode' ) . the_category( ', ' ); ?></p>
 				<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'below' ) : ?>
 					<p class="date"><?php decode_posted_on(); ?></p>
 				<?php endif; ?>
@@ -112,7 +112,7 @@
 
 			<div class="entry-meta">
 				<p class="tags"><?php the_tags( __( 'Tagged as: ', 'decode' ),', ' ); ?></p>
-				<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode' ) . the_category( ', ' ); ?></p>
+				<p class="categories"><?php esc_html_e( 'Categorized in&#58; ', 'decode' ) . the_category( ', ' ); ?></p>
 				<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'below' ) : ?>
 					<p class="date"><?php decode_posted_on(); ?></p>
 				<?php endif; ?>

content.php

@@ -45,7 +45,7 @@
 				<p class="tags"><?php the_tags( __( 'Tagged as: ', 'decode' ),', ' ); ?></p>
 			<?php endif; ?>
 			<?php if ( get_theme_mod( 'show_categories', false ) == true ) : ?>
-				<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode' ) . the_category( ', ' ); ?></p>
+				<p class="categories"><?php esc_html_e( 'Categorized in&#58; ', 'decode' ) . the_category( ', ' ); ?></p>
 			<?php endif; ?>
 			<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'below' ) : ?>
 				<p class="date"><?php decode_posted_on(); ?></p>