commit 80f5f26caf5cbfcf9c4c5bc7c4889a69ded04c89
Author: Joel Pittet <joel@pittet.ca>
Date:   Wed Apr 3 22:43:15 2013 -0700

    causing trouble

diff --git a/core/modules/views/templates/views-view-exposed-form.html.twig b/core/modules/views/templates/views-view-exposed-form.html.twig
index 18c47a7..5619510 100644
--- a/core/modules/views/templates/views-view-exposed-form.html.twig
+++ b/core/modules/views/templates/views-view-exposed-form.html.twig
@@ -35,7 +35,7 @@
   <div class="views-exposed-widgets clearfix">
     {% for widget in widgets %}
       <div id="{{ widget.id }}-wrapper" class="views-exposed-widget views-widget-{{ id }}">
-          {% if widget.label %}
+        {% if widget.label %}
           <label for="{{ widget.id }}">
             {{ widget.label }}
           </label>
@@ -55,7 +55,7 @@
         {% endif %}
       </div>
     {% endfor %}
-    {% if sort_by is defined %}
+    {% if sort_by %}
       <div class="views-exposed-widget views-widget-sort-by">
         {{ sort_by }}
       </div>
@@ -63,12 +63,12 @@
         {{ sort_order }}
       </div>
     {% endif %}
-    {% if items_per_page is defined %}
+    {% if items_per_page %}
       <div class="views-exposed-widget views-widget-per-page">
         {{ items_per_page }}
       </div>
     {% endif %}
-    {% if offset is defined %}
+    {% if offset %}
       <div class="views-exposed-widget views-widget-offset">
         {{ offset }}
       </div>
@@ -76,7 +76,7 @@
     <div class="views-exposed-widget views-submit-button">
       {{ button }}
     </div>
-    {% if reset_button is defined %}
+    {% if reset_button %}
       <div class="views-exposed-widget views-reset-button">
         {{ reset_button }}
       </div>
diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index 3594e8f..9a3d323 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -948,17 +948,17 @@ function template_preprocess_views_view_exposed_form(&$variables) {
   $form = &$variables['form'];
 
   // Put all single checkboxes together in the last spot.
-  $checkboxes = '';
+  $checkboxes = array();
 
   if (!empty($form['q'])) {
-    $variables['q'] = drupal_render($form['q']);
+    $variables['q'] = $form['q'];
   }
 
   $variables['widgets'] = array();
   foreach ($form['#info'] as $id => $info) {
     // Set aside checkboxes.
     if (isset($form[$info['value']]['#type']) && $form[$info['value']]['#type'] == 'checkbox') {
-      $checkboxes .= drupal_render($form[$info['value']]);
+      $checkboxes[] = $form[$info['value']];
       continue;
     }
     $widget = new stdClass();
@@ -974,7 +974,7 @@ function template_preprocess_views_view_exposed_form(&$variables) {
       $widget->operator = drupal_render($form[$info['operator']]);
     }
 
-    $widget->widget = drupal_render($form[$info['value']]);
+    $widget->widget = $form[$info['value']];
 
     if (!empty($info['description'])) {
       $widget->description = check_plain($info['description']);
@@ -984,7 +984,7 @@ function template_preprocess_views_view_exposed_form(&$variables) {
   }
 
   // Wrap up all the checkboxes we set aside into a widget.
-  if ($checkboxes) {
+  if (!empty($checkboxes)) {
     $widget = new stdClass();
     // set up defaults so that there's always something there.
     $widget->label = $widget->operator = $widget->widget = NULL;
@@ -994,17 +994,17 @@ function template_preprocess_views_view_exposed_form(&$variables) {
   }
 
   if (isset($form['sort_by'])) {
-    $variables['sort_by'] = drupal_render($form['sort_by']);
-    $variables['sort_order'] = drupal_render($form['sort_order']);
+    $variables['sort_by'] = $form['sort_by'];
+    $variables['sort_order'] = $form['sort_order'];
   }
   if (isset($form['items_per_page'])) {
-    $variables['items_per_page'] = drupal_render($form['items_per_page']);
+    $variables['items_per_page'] = $form['items_per_page'];
   }
   if (isset($form['offset'])) {
-    $variables['offset'] = drupal_render($form['offset']);
+    $variables['offset'] = $form['offset'];
   }
   if (isset($form['reset'])) {
-    $variables['reset_button'] = drupal_render($form['reset']);
+    $variables['reset_button'] = $form['reset'];
   }
   // This includes the submit button.
   $variables['button'] = drupal_render_children($form);