From 2d1c77837bfb01e4cfbb8c15a1958fd89aed336d Mon Sep 17 00:00:00 2001
From: Josh Levinson <joshalevinson@gmail.com>
Date: Fri, 13 Jun 2014 14:09:20 -0400
Subject: [PATCH 1/5] Initiate the loop before the title is called on pages.
 Failing to do so causes checks that run on the loop's status to fail.

---
 page.php                   | 6 ++++--
 templates/content-page.php | 6 ++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/page.php b/page.php
index 82baa27..82dcf56 100644
--- a/page.php
+++ b/page.php
@@ -1,2 +1,4 @@
-<?php get_template_part('templates/page', 'header'); ?>
-<?php get_template_part('templates/content', 'page'); ?>
+<?php while (have_posts()) : the_post(); ?>
+	<?php get_template_part('templates/page', 'header'); ?>
+	<?php get_template_part('templates/content', 'page'); ?>
+<?php endwhile; ?>
\ No newline at end of file
diff --git a/templates/content-page.php b/templates/content-page.php
index 20a30e3..56366c2 100644
--- a/templates/content-page.php
+++ b/templates/content-page.php
@@ -1,4 +1,2 @@
-<?php while (have_posts()) : the_post(); ?>
-  <?php the_content(); ?>
-  <?php wp_link_pages(array('before' => '<nav class="pagination">', 'after' => '</nav>')); ?>
-<?php endwhile; ?>
+<?php the_content(); ?>
+<?php wp_link_pages(array('before' => '<nav class="pagination">', 'after' => '</nav>')); ?>
\ No newline at end of file

From 5f6c137a172c24117f71905af627f75f6c6669b8 Mon Sep 17 00:00:00 2001
From: joshlevinson <joshalevinson@gmail.com>
Date: Mon, 16 Jun 2014 12:41:45 -0400
Subject: [PATCH 2/5] Update page.php

---
 page.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/page.php b/page.php
index 82dcf56..6e55a0d 100644
--- a/page.php
+++ b/page.php
@@ -1,4 +1,4 @@
 <?php while (have_posts()) : the_post(); ?>
-	<?php get_template_part('templates/page', 'header'); ?>
-	<?php get_template_part('templates/content', 'page'); ?>
-<?php endwhile; ?>
\ No newline at end of file
+  <?php get_template_part('templates/page', 'header'); ?>
+  <?php get_template_part('templates/content', 'page'); ?>
+<?php endwhile; ?>

From 7c39d5b039b5c784e28f734489cb4c4e39cd820e Mon Sep 17 00:00:00 2001
From: kalenjohnson <info@kalenjohnson.com>
Date: Fri, 27 Jun 2014 09:05:41 -0700
Subject: [PATCH 3/5] Updated all instances of home_url() with esc_url()

---
 lib/cleanup.php                 | 2 +-
 lib/widgets.php                 | 2 +-
 templates/header-top-navbar.php | 2 +-
 templates/searchform.php        | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/cleanup.php b/lib/cleanup.php
index d6bed38..0f5c929 100644
--- a/lib/cleanup.php
+++ b/lib/cleanup.php
@@ -227,7 +227,7 @@ function roots_nice_search_redirect() {
 
   $search_base = $wp_rewrite->search_base;
   if (is_search() && !is_admin() && strpos($_SERVER['REQUEST_URI'], "/{$search_base}/") === false) {
-    wp_redirect(home_url("/{$search_base}/" . urlencode(get_query_var('s'))));
+    wp_redirect(esc_url(home_url("/{$search_base}/" . urlencode(get_query_var('s')))));
     exit();
   }
 }
diff --git a/lib/widgets.php b/lib/widgets.php
index 377b1ab..01ac820 100644
--- a/lib/widgets.php
+++ b/lib/widgets.php
@@ -84,7 +84,7 @@ class Roots_Vcard_Widget extends WP_Widget {
     }
   ?>
     <p class="vcard">
-      <a class="fn org url" href="<?php echo home_url('/'); ?>"><?php bloginfo('name'); ?></a><br>
+      <a class="fn org url" href="<?php echo esc_url(home_url('/')); ?>"><?php bloginfo('name'); ?></a><br>
       <span class="adr">
         <span class="street-address"><?php echo $instance['street_address']; ?></span><br>
         <span class="locality"><?php echo $instance['locality']; ?></span>,
diff --git a/templates/header-top-navbar.php b/templates/header-top-navbar.php
index 7589fe8..d83e631 100644
--- a/templates/header-top-navbar.php
+++ b/templates/header-top-navbar.php
@@ -7,7 +7,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="<?php echo home_url(); ?>/"><?php bloginfo('name'); ?></a>
+      <a class="navbar-brand" href="<?php echo esc_url(home_url('/')); ?>/"><?php bloginfo('name'); ?></a>
     </div>
 
     <nav class="collapse navbar-collapse" role="navigation">
diff --git a/templates/searchform.php b/templates/searchform.php
index ab85998..42e32ab 100644
--- a/templates/searchform.php
+++ b/templates/searchform.php
@@ -1,6 +1,6 @@
-<form role="search" method="get" class="search-form form-inline" action="<?php echo home_url('/'); ?>">
+<form role="search" method="get" class="search-form form-inline" action="<?php echo esc_url(home_url('/')); ?>">
   <div class="input-group">
-    <input type="search" value="<?php if (is_search()) { echo get_search_query(); } ?>" name="s" class="search-field form-control" placeholder="<?php _e('Search', 'roots'); ?> <?php bloginfo('name'); ?>">
+    <input type="search" value="<?php if (is_search()) echo esc_url(home_url('/')); ?>" name="s" class="search-field form-control" placeholder="<?php _e('Search', 'roots'); ?> <?php bloginfo('name'); ?>">
     <label class="hide"><?php _e('Search for:', 'roots'); ?></label>
     <span class="input-group-btn">
       <button type="submit" class="search-submit btn btn-default"><?php _e('Search', 'roots'); ?></button>

From b18756206c7d9dddd30aaa3ca1ab40e333f95679 Mon Sep 17 00:00:00 2001
From: kalenjohnson <info@kalenjohnson.com>
Date: Mon, 30 Jun 2014 10:15:26 -0700
Subject: [PATCH 4/5] Fixed search value, changed back to get_search_query,
 removed unnecessary check

---
 templates/searchform.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/searchform.php b/templates/searchform.php
index 42e32ab..f3d4a69 100644
--- a/templates/searchform.php
+++ b/templates/searchform.php
@@ -1,6 +1,6 @@
 <form role="search" method="get" class="search-form form-inline" action="<?php echo esc_url(home_url('/')); ?>">
   <div class="input-group">
-    <input type="search" value="<?php if (is_search()) echo esc_url(home_url('/')); ?>" name="s" class="search-field form-control" placeholder="<?php _e('Search', 'roots'); ?> <?php bloginfo('name'); ?>">
+    <input type="search" value="<?php echo get_search_query(); ?>" name="s" class="search-field form-control" placeholder="<?php _e('Search', 'roots'); ?> <?php bloginfo('name'); ?>">
     <label class="hide"><?php _e('Search for:', 'roots'); ?></label>
     <span class="input-group-btn">
       <button type="submit" class="search-submit btn btn-default"><?php _e('Search', 'roots'); ?></button>

From 1a5c29ac1ab88017ef36ec32e7d8c24ea873b4ec Mon Sep 17 00:00:00 2001
From: kalenjohnson <info@kalenjohnson.com>
Date: Mon, 30 Jun 2014 10:16:50 -0700
Subject: [PATCH 5/5] Changed esc_url to esc_url_raw in redirect

---
 lib/cleanup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cleanup.php b/lib/cleanup.php
index 0f5c929..e93467b 100644
--- a/lib/cleanup.php
+++ b/lib/cleanup.php
@@ -227,7 +227,7 @@ function roots_nice_search_redirect() {
 
   $search_base = $wp_rewrite->search_base;
   if (is_search() && !is_admin() && strpos($_SERVER['REQUEST_URI'], "/{$search_base}/") === false) {
-    wp_redirect(esc_url(home_url("/{$search_base}/" . urlencode(get_query_var('s')))));
+	  wp_redirect(esc_url_raw(home_url("/{$search_base}/" . get_query_var('s'))));
     exit();
   }
 }