diff --git a/core/modules/filter/filter.admin.js b/core/modules/filter/filter.admin.js index 123576a..f55159a 100644 --- a/core/modules/filter/filter.admin.js +++ b/core/modules/filter/filter.admin.js @@ -33,7 +33,7 @@ Drupal.behaviors.filterStatus = { } } // Restripe table after toggling visibility of table row. - Drupal.tableDrag['edit-filters-order'].restripeTable(); + Drupal.tableDrag['filter-order'].restripeTable(); }); // Attach summary for configurable filters (only for screen-readers). diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module index 03bfec1..e4b5338 100644 --- a/core/modules/filter/filter.module +++ b/core/modules/filter/filter.module @@ -1159,7 +1159,6 @@ function template_preprocess_filter_guidelines(&$variables) { function template_preprocess_filter_tips(&$variables) { $tips = $variables['tips']; $long = $variables['long']; - $output = ''; $multiple = count($tips) > 1; @@ -1167,7 +1166,7 @@ function template_preprocess_filter_tips(&$variables) { foreach ($tiplist as $tip_key => $tip) { $tiplist[$tip_key]['attributes'] = new Attribute(array()); if ($long) { - $tiplist[$tip_key]['attributes']['class'] = array('filter-' . str_replace("/", "-", $tip['id'])); + $tiplist[$tip_key]['attributes']['class'] = array('filter-' . str_replace("/", "-", $tip['id'])); } } diff --git a/core/modules/filter/templates/filter-guidelines.html.twig b/core/modules/filter/templates/filter-guidelines.html.twig index 1e75a66..4dd849d 100644 --- a/core/modules/filter/templates/filter-guidelines.html.twig +++ b/core/modules/filter/templates/filter-guidelines.html.twig @@ -6,8 +6,8 @@ * Available variables: * - format: Contains information about the current text format, including the * following: - * - format.name: The name of the text format. - * - format.format: The machine name of the text format, e.g. 'basic_html'. + * - name: The name of the text format. + * - format: The machine name of the text format, e.g. 'basic_html'. * - attributes: HTML attributes for the containing element. * - tips: Descriptions and a CSS ID in the form of 'module-name/filter-id' * (only used when 'long' is TRUE) for each filter in one or more text diff --git a/core/modules/filter/templates/filter-tips.html.twig b/core/modules/filter/templates/filter-tips.html.twig index d63a406..d8f70cb 100644 --- a/core/modules/filter/templates/filter-tips.html.twig +++ b/core/modules/filter/templates/filter-tips.html.twig @@ -11,6 +11,7 @@ * explanations, i.e. intended to be output on the path 'filter/tips' * (TRUE), or are in a short format, i.e. suitable to be displayed below a * form element. Defaults to FALSE. + * - multiple: A flag indicating there is more than one filter tip. * * @see template_preprocess_filter_tips() *