From 6c30441ad4a20fe4f154d5a859b9df0f28cbc8e0 Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Mon, 1 Jul 2013 12:26:01 -0500 Subject: [PATCH] [feature/twig] Changing INCLUDEJS behavior slightly Automatically parsing inline variables the same way it is done for INCLUDE, INCLUDEPHP PHPBB3-11598 --- phpBB/includes/template/twig/lexer.php | 1 + .../styles/prosilver/template/memberlist_search.html | 2 +- phpBB/styles/prosilver/template/overall_footer.html | 2 +- phpBB/styles/prosilver/template/posting_buttons.html | 2 +- phpBB/styles/prosilver/template/timezone_option.html | 2 +- .../prosilver/template/ucp_avatar_options.html | 2 +- .../styles/subsilver2/template/timezone_option.html | 2 +- .../subsilver2/template/ucp_groups_manage.html | 2 +- .../subsilver2/template/ucp_profile_avatar.html | 2 +- tests/template/templates/includejs.html | 12 ++++++------ 10 files changed, 15 insertions(+), 14 deletions(-) diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php index 131cf654ef..d9cc6f60ce 100644 --- a/phpBB/includes/template/twig/lexer.php +++ b/phpBB/includes/template/twig/lexer.php @@ -44,6 +44,7 @@ class phpbb_template_twig_lexer extends Twig_Lexer 'DEFINE.+=', 'INCLUDE', 'INCLUDEPHP', + 'INCLUDEJS', ), $code); // Fix our BEGIN statements diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html index 97769b6155..6d2d87a278 100644 --- a/phpBB/styles/prosilver/template/memberlist_search.html +++ b/phpBB/styles/prosilver/template/memberlist_search.html @@ -38,7 +38,7 @@ function insert_single(user) // ]]> - +

{L_FIND_USERNAME}

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index 01fc3f83da..5422cc7c10 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -55,7 +55,7 @@ - + {SCRIPTS} diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html index b3e2b85492..164e887f75 100644 --- a/phpBB/styles/prosilver/template/posting_buttons.html +++ b/phpBB/styles/prosilver/template/posting_buttons.html @@ -52,7 +52,7 @@ // ]]> - + - + diff --git a/phpBB/styles/subsilver2/template/timezone_option.html b/phpBB/styles/subsilver2/template/timezone_option.html index d71166f517..9b68f81557 100644 --- a/phpBB/styles/subsilver2/template/timezone_option.html +++ b/phpBB/styles/subsilver2/template/timezone_option.html @@ -15,6 +15,6 @@ {S_TZ_OPTIONS} - + diff --git a/phpBB/styles/subsilver2/template/ucp_groups_manage.html b/phpBB/styles/subsilver2/template/ucp_groups_manage.html index 5595d19b9e..13b8b8c6b7 100644 --- a/phpBB/styles/subsilver2/template/ucp_groups_manage.html +++ b/phpBB/styles/subsilver2/template/ucp_groups_manage.html @@ -95,7 +95,7 @@ - + diff --git a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html index 58ef499c41..885d46ef0b 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html @@ -48,6 +48,6 @@ - + diff --git a/tests/template/templates/includejs.html b/tests/template/templates/includejs.html index eca6e90637..ef73700eeb 100644 --- a/tests/template/templates/includejs.html +++ b/tests/template/templates/includejs.html @@ -1,8 +1,8 @@ - - + + - - - - + + + + {SCRIPTS}