makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5828 from AlfredoRamos/ticket/16323

Browse source 
[ticket/16323] Replace the spaceless tag with its homologue filter
This commit is contained in:
Marc Alexander 2020-01-18 14:34:32 +01:00
commit ebd9d0fe25
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/phpbb/template/twig/lexer.php
View file

@ -72,6 +72,8 @@ class lexer extends \Twig_Lexer
'endspaceless', 'endspaceless',
'verbatim', 'verbatim',
'endverbatim', 'endverbatim',
'apply',
'endapply',
); );
// Fix tokens that may have inline variables (e.g. <!-- DEFINE $TEST = '{FOO}') // Fix tokens that may have inline variables (e.g. <!-- DEFINE $TEST = '{FOO}')

8
phpBB/styles/prosilver/template/navbar_footer.html
View file

@ -4,22 +4,22 @@
<ul id="nav-footer" class="nav-footer linklist" role="menubar"> <ul id="nav-footer" class="nav-footer linklist" role="menubar">
<li class="breadcrumbs"> <li class="breadcrumbs">
<!-- IF U_SITE_HOME --> <!-- IF U_SITE_HOME -->
{% spaceless %} {% apply spaceless %}
<span class="crumb"> <span class="crumb">
<a href="{U_SITE_HOME}" data-navbar-reference="home"> <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> <i class="icon fa-home fa-fw" aria-hidden="true"></i><span>{L_SITE_HOME}</span>
</a> </a>
</span> </span>
{% endspaceless %} {% endapply %}
<!-- ENDIF --> <!-- ENDIF -->
<!-- EVENT overall_footer_breadcrumb_prepend --> <!-- EVENT overall_footer_breadcrumb_prepend -->
{% spaceless %} {% apply spaceless %}
<span class="crumb"> <span class="crumb">
<a href="{U_INDEX}" data-navbar-reference="index"> <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> <!-- IF not U_SITE_HOME --><i class="icon fa-home fa-fw" aria-hidden="true"></i><!-- ENDIF --><span>{L_INDEX}</span>
</a> </a>
</span> </span>
{% endspaceless %} {% endapply %}
<!-- EVENT overall_footer_breadcrumb_append --> <!-- EVENT overall_footer_breadcrumb_append -->
</li> </li>
<!-- IF U_WATCH_FORUM_LINK and not S_IS_BOT --> <!-- IF U_WATCH_FORUM_LINK and not S_IS_BOT -->