Merge pull request #2110 from roots/revert-2090-master

Revert "Add searchform partial and function to replace default WordPress functionality"

app/filters.php

@@ -13,11 +13,6 @@ add_filter('body_class', function (array $classes) {
         }
     }
 
-    /** Add a global class to everything.
-     *  We want it to come first, so stuff its filter does can be overridden.
-     */
-    array_unshift($classes, 'app');
-
     /** Add class if sidebar is active */
     if (display_sidebar()) {
         $classes[] = 'sidebar-primary';
@@ -85,23 +80,3 @@ add_filter('comments_template', function ($comments_template) {
 
     return $comments_template;
 }, 100);
-
-/**
- * Render WordPress searchform using Blade
- */
-add_filter('get_search_form', function () {
-    return template('partials.searchform');
-});
-
-/**
- * Collect data for searchform.
- */
-add_filter('sage/template/app/data', function ($data) {
-    return $data + [
-        'sf_action' => esc_url(home_url('/')),
-        'sf_screen_reader_text' => _x('Search for:', 'label', 'sage'),
-        'sf_placeholder' => esc_attr_x('Search …', 'placeholder', 'sage'),
-        'sf_current_query' => get_search_query(),
-        'sf_submit_text' => esc_attr_x('Search', 'submit button', 'sage'),
-    ];
-});

resources/views/partials/searchform.blade.php

@@ -1,7 +0,0 @@
-<form role="search" method="get" class="search-form" action="{{ $sf_action }}">
-  <label>
-    <span class="screen-reader-text">{{ $sf_screen_reader_text }}</span>
-    <input type="search" class="search-field" placeholder="{!! $sf_placeholder !!}" value="{{ $sf_current_query }}" name="s">
-  </label>
-  <input type="submit" class="search-submit" value="{{ $sf_submit_text }}">
-</form>