commit f08258d45efe2f841346d86cfeafcf258db1ac29 Author: Mark Shropshire Date: Sun Apr 21 11:15:06 2013 -0400 1843740-new changes * Fixed issue where duplicate form fields are rendered with the submit button. * Changed instances of $vars to $variables in the related Views theme function. * Removed views-mini-pager.html.twig template since it doesn't seem to be doing anything. The mini pagers are rendering directly from the theme function. This doesn't seem to be related to this issue and should be created as a new issue. diff --git a/core/modules/views/templates/views-mini-pager.html.twig b/core/modules/views/templates/views-mini-pager.html.twig deleted file mode 100644 index f268881..0000000 --- a/core/modules/views/templates/views-mini-pager.html.twig +++ /dev/null @@ -1,16 +0,0 @@ -{# -/** - * @file - * Default theme implementation for a Views mini-pager. - * - * Available variables: - * - items: A list of pager elements. - * - pager: A themed list of pager elements. - * - * @see template_preprocess() - * @see template_preprocess_views_mini_pager() - * - * @ingroup themeable - */ -#} -{{ pager }} diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc index b841fe6..83fc7dc 100644 --- a/core/modules/views/views.theme.inc +++ b/core/modules/views/views.theme.inc @@ -940,21 +940,21 @@ function template_preprocess_views_view_row_rss(&$vars) { * * Default template: views-exposed-form.html.twig. * - * @param array $vars + * @param array $variables * An associative array containing: * - form: A render element representing the form. */ -function template_preprocess_views_exposed_form(&$vars) { - $form = &$vars['form']; +function template_preprocess_views_exposed_form(&$variables) { + $form = &$variables['form']; // Put all single checkboxes together in the last spot. $checkboxes = array(); if (!empty($form['q'])) { - $vars['q'] = $form['q']; + $variables['q'] = $form['q']; } - $vars['widgets'] = array(); + $variables['widgets'] = array(); foreach ($form['#info'] as $id => $info) { // Set aside checkboxes. if (isset($form[$info['value']]['#type']) && $form[$info['value']]['#type'] == 'checkbox') { @@ -966,8 +966,7 @@ function template_preprocess_views_exposed_form(&$vars) { $widget->label = $widget->operator = $widget->widget = $widget->description = ''; $widget->id = isset($form[$info['value']]['#id']) ? $form[$info['value']]['#id'] : ''; - debug($form[$info['value']]['#id']); - debug($widget->id); + if (!empty($info['label'])) { $widget->label = check_plain($info['label']); } @@ -981,7 +980,7 @@ function template_preprocess_views_exposed_form(&$vars) { $widget->description = check_plain($info['description']); } - $vars['widgets'][$id] = $widget; + $variables['widgets'][$id] = $widget; } // Wrap up all the checkboxes we set aside into a widget. @@ -991,24 +990,24 @@ function template_preprocess_views_exposed_form(&$vars) { $widget->label = $widget->operator = $widget->widget = ''; $widget->id = 'checkboxes'; $widget->widget = $checkboxes; - $vars['widgets']['checkboxes'] = $widget; + $variables['widgets']['checkboxes'] = $widget; } if (isset($form['sort_by'])) { - $vars['sort_by'] = $form['sort_by']; - $vars['sort_order'] = $form['sort_order']; + $variables['sort_by'] = $form['sort_by']; + $variables['sort_order'] = $form['sort_order']; } if (isset($form['items_per_page'])) { - $vars['items_per_page'] = $form['items_per_page']; + $variables['items_per_page'] = $form['items_per_page']; } if (isset($form['offset'])) { - $vars['offset'] = $form['offset']; + $variables['offset'] = $form['offset']; } if (isset($form['reset'])) { - $vars['reset_button'] = $form['reset']; + $variables['reset_button'] = $form['reset']; } // This includes the submit button. - $vars['button'] = drupal_render_children($form); + $variables['button'] = $form['submit']; } /**