commit 5651d4ba945463398b60b75d4bc6c952866ca01a Author: Joel Pittet Date: Thu Aug 20 17:30:04 2015 -0700 typos diff --git a/core/modules/views/templates/views-view-table.html.twig b/core/modules/views/templates/views-view-table.html.twig index 2a6568c..903b059 100644 --- a/core/modules/views/templates/views-view-table.html.twig +++ b/core/modules/views/templates/views-view-table.html.twig @@ -74,19 +74,19 @@ {%- if column.wrapper_element -%} <{{ column.wrapper_element }}> - {% if column.url %} - {{ column.content }}{{ column.sort_indicator }} - {% else %} - {{ column.content }}{{ column.sort_indicator }} - {% endif %} + {%- if column.url -%} + {{ column.content }}{{ column.sort_indicator }} + {%- else -%} + {{ column.content }}{{ column.sort_indicator }} + {%- endif -%} {%- else -%} - {% if column.url %} + {%- if column.url -%} {{ column.content }}{{ column.sort_indicator }} - {% else %} - {{ column.content }}{{ column.sort_indicator }} - {% endif %} - {%- endif %} + {%- else -%} + {{- column.content }}{{ column.sort_indicator }} + {%- endif -%} + {%- endif -%} {% endfor %} diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc index df93fa4..7011715 100644 --- a/core/modules/views/views.theme.inc +++ b/core/modules/views/views.theme.inc @@ -496,7 +496,8 @@ function template_preprocess_views_view_table(&$variables) { ); // It is ok to specify no URL path here as we will always reload the // current page. - $variables['header'][$field]['url'] = new Url('', [], $link_options)->toString(); + $url = new Url('', [], $link_options); + $variables['header'][$field]['url'] = $url->toString(); $variables['header'][$field]['content'] = $label; } diff --git a/core/themes/classy/templates/views/views-view-table.html.twig b/core/themes/classy/templates/views/views-view-table.html.twig index 0c9014b..067d5ba 100644 --- a/core/themes/classy/templates/views/views-view-table.html.twig +++ b/core/themes/classy/templates/views/views-view-table.html.twig @@ -74,19 +74,19 @@ {%- if column.wrapper_element -%} <{{ column.wrapper_element }}> - {% if column.url %} - {{ column.content }}{{ column.sort_indicator }} - {% else %} - {{ column.content }}{{ column.sort_indicator }} - {% endif %} + {%- if column.url -%} + {{ column.content }}{{ column.sort_indicator }} + {%- else -%} + {{ column.content }}{{ column.sort_indicator }} + {%- endif -%} {%- else -%} - {% if column.url %} + {%- if column.url -%} {{ column.content }}{{ column.sort_indicator }} - {% else %} - {{ column.content }}{{ column.sort_indicator }} - {% endif %} - {%- endif %} + {%- else -%} + {{- column.content }}{{ column.sort_indicator }} + {%- endif -%} + {%- endif -%} {% endfor %}