diff options
| author |   Marc Alexander <admin@m-a-styles.de> | 2020-01-18 14:34:37 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2020-01-18 14:34:37 +0100 |
| commit | 765f2cfb5f8ae64ce0d1f063d98ad4f115947c3a (patch) | |
| tree | 360617d92606980eda1d378150a48b455ddb8aeb | |
| parent | Merge pull request #5808 from marc1706/ticket/16284 (diff) | |
| parent | Merge pull request #5828 from AlfredoRamos/ticket/16323 (diff) | |
| download | phpbb-765f2cfb5f8ae64ce0d1f063d98ad4f115947c3a.tar.gz phpbb-765f2cfb5f8ae64ce0d1f063d98ad4f115947c3a.tar.bz2 phpbb-765f2cfb5f8ae64ce0d1f063d98ad4f115947c3a.zip | |
Merge branch '3.3.x'
| -rw-r--r-- | phpBB/phpbb/template/twig/lexer.php | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/navbar_footer.html | 8 |
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 --> |