aboutsummaryrefslogtreecommitdiff
path: root/phpBB
diff options
context:
space:
mode:
authorAlfredo Ramos <alfredo.ramos.sanchez@gmail.com>2020-01-14 14:44:31 -0600
committerAlfredo Ramos <alfredo.ramos.sanchez@gmail.com>2020-01-14 14:44:34 -0600
commitff5fe3040771fa83fe27b58919e205804d9560a9 (patch)
treebf11ed8b664d0c728a6598feaf4a96494556e94a /phpBB
parentMerge branch '3.2.x' into 3.3.x (diff)
downloadphpbb-ff5fe3040771fa83fe27b58919e205804d9560a9.tar.gz
phpbb-ff5fe3040771fa83fe27b58919e205804d9560a9.tar.bz2
phpbb-ff5fe3040771fa83fe27b58919e205804d9560a9.zip
[ticket/16323] Replace the spaceless tag with its homologue filter
PHPBB3-16323
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/phpbb/template/twig/lexer.php2
-rw-r--r--phpBB/styles/prosilver/template/navbar_footer.html8
2 files changed, 6 insertions, 4 deletions
diff --git a/phpBB/phpbb/template/twig/lexer.php b/phpBB/phpbb/template/twig/lexer.php
index 6615a46067..10346ac299 100644
--- a/phpBB/phpbb/template/twig/lexer.php
+++ b/phpBB/phpbb/template/twig/lexer.php
@@ -72,6 +72,8 @@ class lexer extends \Twig_Lexer
'endspaceless',
'verbatim',
'endverbatim',
+ 'apply',
+ 'endapply',
);
// Fix tokens that may have inline variables (e.g. <!-- DEFINE $TEST = '{FOO}')
diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html
index 4e3d1e295e..1c5031e9b9 100644
--- a/phpBB/styles/prosilver/template/navbar_footer.html
+++ b/phpBB/styles/prosilver/template/navbar_footer.html
@@ -4,22 +4,22 @@
<ul id="nav-footer" class="nav-footer linklist" role="menubar">
<li class="breadcrumbs">
<!-- IF U_SITE_HOME -->
- {% spaceless %}
+ {% apply spaceless %}
<span class="crumb">
<a href="{U_SITE_HOME}" data-navbar-reference="home">
<i class="icon fa-home fa-fw" aria-hidden="true"></i><span>{L_SITE_HOME}</span>
</a>
</span>
- {% endspaceless %}
+ {% endapply %}
<!-- ENDIF -->
<!-- EVENT overall_footer_breadcrumb_prepend -->
- {% spaceless %}
+ {% apply spaceless %}
<span class="crumb">
<a href="{U_INDEX}" data-navbar-reference="index">
<!-- IF not U_SITE_HOME --><i class="icon fa-home fa-fw" aria-hidden="true"></i><!-- ENDIF --><span>{L_INDEX}</span>
</a>
</span>
- {% endspaceless %}
+ {% endapply %}
<!-- EVENT overall_footer_breadcrumb_append -->
</li>
<!-- IF U_WATCH_FORUM_LINK and not S_IS_BOT -->