From 2a06b3dfbac62801716213b4d94e4abbba874f9c Mon Sep 17 00:00:00 2001
From: Tom Adams <tom@dxw.com>
Date: Thu, 21 Aug 2014 15:21:44 -0400
Subject: [PATCH 01/16] Check for template_include passing non-strings. Fixes
 #1134

---
 lib/wrapper.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/wrapper.php b/lib/wrapper.php
index c5bd4b1..ce159ce 100644
--- a/lib/wrapper.php
+++ b/lib/wrapper.php
@@ -36,6 +36,11 @@ class Roots_Wrapping {
   }
 
   static function wrap($main) {
+    // Check for other filters returning null
+    if (!is_string($main)) {
+      return $main;
+    }
+
     self::$main_template = $main;
     self::$base = basename(self::$main_template, '.php');
 

From b935e14c6a79f817c582be256f5435503754c0a8 Mon Sep 17 00:00:00 2001
From: Chris Carr <chris@c2itllc.com>
Date: Sat, 25 Oct 2014 07:08:52 -0700
Subject: [PATCH 02/16] Make search term `required` in search form.

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

diff --git a/templates/searchform.php b/templates/searchform.php
index 2d00878..497045d 100644
--- a/templates/searchform.php
+++ b/templates/searchform.php
@@ -1,7 +1,7 @@
 <form role="search" method="get" class="search-form form-inline" action="<?php echo esc_url(home_url('/')); ?>">
   <label class="sr-only"><?php _e('Search for:', 'roots'); ?></label>
   <div class="input-group">
-    <input type="search" value="<?php echo get_search_query(); ?>" 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'); ?>" required>
     <span class="input-group-btn">
       <button type="submit" class="search-submit btn btn-default"><?php _e('Search', 'roots'); ?></button>
     </span>

From 2e470c79032fdd80446d6248f5cc743cc28af3b9 Mon Sep 17 00:00:00 2001
From: alexsomeoddpilot <alex@someoddpilot.com>
Date: Thu, 30 Oct 2014 09:24:33 -0500
Subject: [PATCH 03/16] Fixing dead variables and params

---
 lib/extras.php  | 2 +-
 lib/gallery.php | 1 -
 lib/nav.php     | 2 ++
 lib/utils.php   | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/extras.php b/lib/extras.php
index f4d9810..994ff30 100644
--- a/lib/extras.php
+++ b/lib/extras.php
@@ -2,7 +2,7 @@
 /**
  * Clean up the_excerpt()
  */
-function roots_excerpt_more($more) {
+function roots_excerpt_more() {
   return ' &hellip; <a href="' . get_permalink() . '">' . __('Continued', 'roots') . '</a>';
 }
 add_filter('excerpt_more', 'roots_excerpt_more');
diff --git a/lib/gallery.php b/lib/gallery.php
index 67f4d01..975a8ed 100644
--- a/lib/gallery.php
+++ b/lib/gallery.php
@@ -123,7 +123,6 @@ if (current_theme_supports('bootstrap-gallery')) {
  * Add class="thumbnail img-thumbnail" to attachment items
  */
 function roots_attachment_link_class($html) {
-  $postid = get_the_ID();
   $html = str_replace('<a', '<a class="thumbnail img-thumbnail"', $html);
   return $html;
 }
diff --git a/lib/nav.php b/lib/nav.php
index 186ada2..493e562 100644
--- a/lib/nav.php
+++ b/lib/nav.php
@@ -74,6 +74,8 @@ add_filter('nav_menu_item_id', '__return_null');
  * Use Roots_Nav_Walker() by default
  */
 function roots_nav_menu_args($args = '') {
+  $roots_nav_menu_args = array();
+
   $roots_nav_menu_args['container'] = false;
 
   if (!$args['items_wrap']) {
diff --git a/lib/utils.php b/lib/utils.php
index 93e5116..fb8d737 100644
--- a/lib/utils.php
+++ b/lib/utils.php
@@ -8,7 +8,7 @@ function is_element_empty($element) {
 }
 
 // Tell WordPress to use searchform.php from the templates/ directory
-function roots_get_search_form($form) {
+function roots_get_search_form() {
   $form = '';
   locate_template('/templates/searchform.php', true, false);
   return $form;

From de67c88b92719746b0a3ca09008010562bf325df Mon Sep 17 00:00:00 2001
From: alexsomeoddpilot <alex@someoddpilot.com>
Date: Thu, 30 Oct 2014 09:41:56 -0500
Subject: [PATCH 04/16] Removing dead variables in activation

---
 lib/activation.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/activation.php b/lib/activation.php
index 4b677d6..fef50f7 100644
--- a/lib/activation.php
+++ b/lib/activation.php
@@ -15,7 +15,7 @@ function roots_theme_activation_options_init() {
 }
 add_action('admin_init', 'roots_theme_activation_options_init');
 
-function roots_activation_options_page_capability($capability) {
+function roots_activation_options_page_capability() {
   return 'edit_theme_options';
 }
 add_filter('option_page_capability_roots_activation_options', 'roots_activation_options_page_capability');
@@ -24,7 +24,7 @@ function roots_theme_activation_options_add_page() {
   $roots_activation_options = roots_get_theme_activation_options();
 
   if (!$roots_activation_options) {
-    $theme_page = add_theme_page(
+    add_theme_page(
       __('Theme Activation', 'roots'),
       __('Theme Activation', 'roots'),
       'edit_theme_options',
@@ -141,7 +141,7 @@ function roots_theme_activation_action() {
         'post_type' => 'page'
       );
 
-      $result = wp_insert_post($add_default_pages);
+      wp_insert_post($add_default_pages);
     }
 
     $home = get_page_by_title(__('Home', 'roots'));

From 2072b30918e7eea18a5556481f81d06d8cf71496 Mon Sep 17 00:00:00 2001
From: alexsomeoddpilot <alex@someoddpilot.com>
Date: Thu, 30 Oct 2014 09:47:00 -0500
Subject: [PATCH 05/16] Declaring properties on Roots_Wrapping

---
 lib/wrapper.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/wrapper.php b/lib/wrapper.php
index c5bd4b1..1e033ec 100644
--- a/lib/wrapper.php
+++ b/lib/wrapper.php
@@ -15,7 +15,13 @@ function roots_sidebar_path() {
 
 class Roots_Wrapping {
   // Stores the full path to the main template file
-  static $main_template;
+  public static $main_template;
+
+  // basename of template file
+  public $slug;
+
+  // array of templates
+  public $templates;
 
   // Stores the base name of the template file; e.g. 'page' for 'page.php' etc.
   static $base;

From 653608ab4de5cb1b02c1403e5d7317887e8e9cb1 Mon Sep 17 00:00:00 2001
From: Mark Thomas <markthethomas@gmail.com>
Date: Thu, 30 Oct 2014 09:50:40 -0700
Subject: [PATCH 06/16] Bump Bootstrap to 3.3.0

---
 bower.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index 89821c6..7097ae0 100644
--- a/bower.json
+++ b/bower.json
@@ -15,7 +15,7 @@
   "dependencies": {
     "modernizr": "2.8.2",
     "jquery": "1.11.1",
-    "bootstrap": "3.2.0",
+    "bootstrap": "3.3.0",
     "respond": "1.4.2"
   }
 }

From 6681d2480d1408b45dd8b31daeeb09149d402970 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Tue, 11 Nov 2014 11:34:38 -0600
Subject: [PATCH 07/16] Add some base comment styling

Ref #1197, #1111, #1181
---
 assets/less/components/_comments.less | 19 +++++++++++++++++++
 assets/less/main.less                 |  3 ++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 assets/less/components/_comments.less

diff --git a/assets/less/components/_comments.less b/assets/less/components/_comments.less
new file mode 100644
index 0000000..4b301a2
--- /dev/null
+++ b/assets/less/components/_comments.less
@@ -0,0 +1,19 @@
+.comment-list {
+  &:extend(.list-unstyled all);
+}
+.comment-list ol {
+  list-style: none;
+}
+.comment-form p {
+  &:extend(.form-group all);
+}
+.comment-form input[type="text"],
+.comment-form input[type="email"],
+.comment-form input[type="url"],
+.comment-form textarea {
+  &:extend(.form-control all);
+}
+.comment-form input[type="submit"] {
+  &:extend(.btn all);
+  &:extend(.btn-primary all);
+}
diff --git a/assets/less/main.less b/assets/less/main.less
index 5affb9f..41b945c 100644
--- a/assets/less/main.less
+++ b/assets/less/main.less
@@ -2,11 +2,12 @@
 @import "_bootstrap";
 
 // Variable overrides and custom variables
-@import "_variables"; 
+@import "_variables";
 
 // Roots
 @import "_global";                   // Base styling & custom mixins
 @import "components/_buttons";       // Button tweaks
+@import "components/_comments";      // Comment styling
 @import "components/_forms";         // Form tweaks
 @import "components/_media";         // WordPress media
 @import "components/_wp-classes";    // WordPress generated classes

From a58f20752af9eb3505227f90f912e06fe501e291 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Tue, 11 Nov 2014 11:47:41 -0600
Subject: [PATCH 08/16] Formatting / syntax fix

---
 assets/less/components/_media.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/less/components/_media.less b/assets/less/components/_media.less
index 349fe12..4918f7b 100644
--- a/assets/less/components/_media.less
+++ b/assets/less/components/_media.less
@@ -4,7 +4,7 @@
 }
 
 .wp-caption-text {
-    &:extend(.thumbnail .caption);
+  &:extend(.thumbnail .caption all);
 }
 
 // Gallery shortcode

From 3c5560128e184e812a9ca4df4ee5143692bc9edd Mon Sep 17 00:00:00 2001
From: Kalen Johnson <info@kalenjohnson.com>
Date: Tue, 11 Nov 2014 11:48:59 -0800
Subject: [PATCH 09/16] Updating npm dependencies

---
 package.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index cd2024f..840c6cb 100644
--- a/package.json
+++ b/package.json
@@ -23,17 +23,17 @@
     "node": ">= 0.10.0"
   },
   "devDependencies": {
-    "bower": ">=1.3.9",
+    "bower": ">=1.3.12",
     "grunt": "~0.4.5",
-    "grunt-autoprefixer": "~1.0.0",
+    "grunt-autoprefixer": "~1.0.1",
     "grunt-contrib-concat": "~0.5.0",
     "grunt-contrib-jshint": "~0.10.0",
-    "grunt-contrib-less": "~0.11.3",
-    "grunt-contrib-uglify": "~0.5.0",
+    "grunt-contrib-less": "~0.12.0",
+    "grunt-contrib-uglify": "~0.6.0",
     "grunt-contrib-watch": "~0.6.1",
-    "grunt-modernizr": "~0.5.2",
+    "grunt-modernizr": "~0.6.0",
     "grunt-wp-assets": "~0.2.6",
-    "load-grunt-tasks": "~0.6.0",
-    "time-grunt": "~0.4.0"
+    "load-grunt-tasks": "~1.0.0",
+    "time-grunt": "~1.0.0"
   }
 }

From d1e2196f2ce1b27147f0f6d3caf6bec2173fa738 Mon Sep 17 00:00:00 2001
From: QWp6t <hi@qwp6t.me>
Date: Tue, 4 Nov 2014 17:37:30 -0800
Subject: [PATCH 10/16] Store display_sidebar in static variable

---
 lib/config.php | 53 +++++++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/lib/config.php b/lib/config.php
index 4118848..4019a76 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -34,31 +34,36 @@ add_filter('body_class', 'roots_sidebar_body_class');
  * See lib/sidebar.php for more details
  */
 function roots_display_sidebar() {
-  $sidebar_config = new Roots_Sidebar(
-    /**
-     * Conditional tag checks (http://codex.wordpress.org/Conditional_Tags)
-     * Any of these conditional tags that return true won't show the sidebar
-     *
-     * To use a function that accepts arguments, use the following format:
-     *
-     * array('function_name', array('arg1', 'arg2'))
-     *
-     * The second element must be an array even if there's only 1 argument.
-     */
-    array(
-      'is_404',
-      'is_front_page'
-    ),
-    /**
-     * Page template checks (via is_page_template())
-     * Any of these page templates that return true won't show the sidebar
-     */
-    array(
-      'template-custom.php'
-    )
-  );
+  static $display;
 
-  return apply_filters('roots/display_sidebar', $sidebar_config->display);
+  if (!isset($display)) {
+    $sidebar_config = new Roots_Sidebar(
+      /**
+       * Conditional tag checks (http://codex.wordpress.org/Conditional_Tags)
+       * Any of these conditional tags that return true won't show the sidebar
+       *
+       * To use a function that accepts arguments, use the following format:
+       *
+       * array('function_name', array('arg1', 'arg2'))
+       *
+       * The second element must be an array even if there's only 1 argument.
+       */
+      array(
+        'is_404',
+        'is_front_page'
+      ),
+      /**
+       * Page template checks (via is_page_template())
+       * Any of these page templates that return true won't show the sidebar
+       */
+      array(
+        'template-custom.php'
+      )
+    );
+    $display = apply_filters('roots/display_sidebar', $sidebar_config->display);
+  }  
+
+  return $display;
 }
 
 /**

From 1d05b41197f5b4ee96ba26cb7288e7c529c93dae Mon Sep 17 00:00:00 2001
From: Michael Silber <michael@cfxdesign.com>
Date: Thu, 13 Nov 2014 19:41:45 -0500
Subject: [PATCH 11/16] Move wp_head() to be the last markup before </head>

---
 templates/head.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/head.php b/templates/head.php
index 76f4e77..a5ed07e 100644
--- a/templates/head.php
+++ b/templates/head.php
@@ -6,7 +6,7 @@
   <title><?php wp_title('|', true, 'right'); ?></title>
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
-  <?php wp_head(); ?>
-
   <link rel="alternate" type="application/rss+xml" title="<?php echo get_bloginfo('name'); ?> Feed" href="<?php echo esc_url(get_feed_link()); ?>">
+
+  <?php wp_head(); ?>
 </head>

From d4cf20b2255bfbef2a2db3b3925d9dbc334c890a Mon Sep 17 00:00:00 2001
From: Mark Thomas <markthethomas@gmail.com>
Date: Mon, 17 Nov 2014 08:29:35 -0800
Subject: [PATCH 12/16] Bump to 3.3.1

Just bumpin'.
---
 bower.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index 7097ae0..6bf6755 100644
--- a/bower.json
+++ b/bower.json
@@ -15,7 +15,7 @@
   "dependencies": {
     "modernizr": "2.8.2",
     "jquery": "1.11.1",
-    "bootstrap": "3.3.0",
+    "bootstrap": "3.3.1",
     "respond": "1.4.2"
   }
 }

From d37c9a8604018d0a1b79c6e9926e7e732f02042d Mon Sep 17 00:00:00 2001
From: Leonardo Giacone <leo@faceboardfoundation.com>
Date: Mon, 1 Dec 2014 01:03:16 +0100
Subject: [PATCH 13/16] Removed Roots_Nav_Walker as default for all menus

---
 lib/nav.php          | 4 ----
 templates/header.php | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/nav.php b/lib/nav.php
index 493e562..af24dbb 100644
--- a/lib/nav.php
+++ b/lib/nav.php
@@ -86,10 +86,6 @@ function roots_nav_menu_args($args = '') {
     $roots_nav_menu_args['depth'] = 2;
   }
 
-  if (!$args['walker']) {
-    $roots_nav_menu_args['walker'] = new Roots_Nav_Walker();
-  }
-
   return array_merge($args, $roots_nav_menu_args);
 }
 add_filter('wp_nav_menu_args', 'roots_nav_menu_args');
diff --git a/templates/header.php b/templates/header.php
index 6639eb7..9c2e7f2 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -13,7 +13,7 @@
     <nav class="collapse navbar-collapse" role="navigation">
       <?php
         if (has_nav_menu('primary_navigation')) :
-          wp_nav_menu(array('theme_location' => 'primary_navigation', 'menu_class' => 'nav navbar-nav'));
+          wp_nav_menu(array('theme_location' => 'primary_navigation', 'walker' => new Roots_Nav_Walker(), 'menu_class' => 'nav navbar-nav'));
         endif;
       ?>
     </nav>

From 49221085d16ce599a8269c3274d5ffe8f6ffdcab Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Thu, 18 Dec 2014 14:07:43 -0600
Subject: [PATCH 14/16] Remove wp_title, add title-tag theme support

---
 lib/extras.php     | 14 --------------
 lib/init.php       |  4 ++++
 templates/head.php |  1 -
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/lib/extras.php b/lib/extras.php
index 994ff30..a7b2821 100644
--- a/lib/extras.php
+++ b/lib/extras.php
@@ -6,17 +6,3 @@ function roots_excerpt_more() {
   return ' &hellip; <a href="' . get_permalink() . '">' . __('Continued', 'roots') . '</a>';
 }
 add_filter('excerpt_more', 'roots_excerpt_more');
-
-/**
- * Manage output of wp_title()
- */
-function roots_wp_title($title) {
-  if (is_feed()) {
-    return $title;
-  }
-
-  $title .= get_bloginfo('name');
-
-  return $title;
-}
-add_filter('wp_title', 'roots_wp_title', 10);
diff --git a/lib/init.php b/lib/init.php
index a2ba3b1..d9da7db 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -7,6 +7,10 @@ function roots_setup() {
   // Community translations can be found at https://github.com/roots/roots-translations
   load_theme_textdomain('roots', get_template_directory() . '/lang');
 
+  // Enable plugins to manage the document title
+  // http://codex.wordpress.org/Function_Reference/add_theme_support#Title_Tag
+  add_theme_support('title-tag');
+
   // Register wp_nav_menu() menus
   // http://codex.wordpress.org/Function_Reference/register_nav_menus
   register_nav_menus(array(
diff --git a/templates/head.php b/templates/head.php
index a5ed07e..d081d0c 100644
--- a/templates/head.php
+++ b/templates/head.php
@@ -3,7 +3,6 @@
 <head>
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <title><?php wp_title('|', true, 'right'); ?></title>
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
   <link rel="alternate" type="application/rss+xml" title="<?php echo get_bloginfo('name'); ?> Feed" href="<?php echo esc_url(get_feed_link()); ?>">

From 4f26c81bb1d8170f010717cb8995d79324885bff Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Thu, 18 Dec 2014 14:11:35 -0600
Subject: [PATCH 15/16] Use get_the_archive_title

---
 lib/titles.php | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/lib/titles.php b/lib/titles.php
index 21f8c05..6a09e51 100644
--- a/lib/titles.php
+++ b/lib/titles.php
@@ -10,23 +10,7 @@ function roots_title() {
       return __('Latest Posts', 'roots');
     }
   } elseif (is_archive()) {
-    $term = get_term_by('slug', get_query_var('term'), get_query_var('taxonomy'));
-    if ($term) {
-      return apply_filters('single_term_title', $term->name);
-    } elseif (is_post_type_archive()) {
-      return apply_filters('the_title', get_queried_object()->labels->name);
-    } elseif (is_day()) {
-      return sprintf(__('Daily Archives: %s', 'roots'), get_the_date());
-    } elseif (is_month()) {
-      return sprintf(__('Monthly Archives: %s', 'roots'), get_the_date('F Y'));
-    } elseif (is_year()) {
-      return sprintf(__('Yearly Archives: %s', 'roots'), get_the_date('Y'));
-    } elseif (is_author()) {
-      $author = get_queried_object();
-      return sprintf(__('Author Archives: %s', 'roots'), apply_filters('the_author', is_object($author) ? $author->display_name : null));
-    } else {
-      return single_cat_title('', false);
-    }
+    return get_the_archive_title();
   } elseif (is_search()) {
     return sprintf(__('Search Results for %s', 'roots'), get_search_query());
   } elseif (is_404()) {

From 271fad502add8dfd839af8bf901e2f830c7a6c94 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Thu, 18 Dec 2014 14:18:29 -0600
Subject: [PATCH 16/16] Roots 7.0.3

---
 CHANGELOG.md | 8 ++++++++
 bower.json   | 2 +-
 package.json | 2 +-
 style.css    | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3addc2..e2556f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+### 7.0.3: December 18th, 2014
+* Use `get_the_archive_title`
+* Remove `wp_title`, add title-tag theme support
+* Remove `Roots_Nav_Walker` as default for all menus
+* Update to Bootstrap 3.3.1
+* Add some base comment styling
+* Make search tearm `required` in search form
+
 ### 7.0.2: October 24th, 2014
 * Simplify comments, use core comment form and list
 * Remove HTML5 shiv from Modernizr build
diff --git a/bower.json b/bower.json
index 6bf6755..b3ff192 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "roots",
-  "version": "7.0.2",
+  "version": "7.0.3",
   "homepage": "http://roots.io",
   "authors": [
     "Ben Word <ben@benword.com>"
diff --git a/package.json b/package.json
index 840c6cb..221fb79 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "roots",
-  "version": "7.0.2",
+  "version": "7.0.3",
   "author": "Ben Word <ben@benword.com>",
   "homepage": "http://roots.io",
   "repository": {
diff --git a/style.css b/style.css
index 1fecc68..ff3eb04 100644
--- a/style.css
+++ b/style.css
@@ -2,7 +2,7 @@
 Theme Name:         Roots Starter Theme
 Theme URI:          http://roots.io/starter-theme/
 Description:        Roots is a WordPress starter theme based on HTML5 Boilerplate & Bootstrap. <a href="https://github.com/roots/roots/contributors">Contribute on GitHub</a>
-Version:            7.0.2
+Version:            7.0.3
 Author:             Roots
 Author URI:         http://roots.io/