diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-06-24 13:32:31 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-06-24 13:32:31 -0500 |
| commit | 1a0819bdc40fd6b40b556ba1739ae71214719b43 (patch) | |
| tree | 45e0bb5382bbd8ecaa25d2683ec9fb4de2348687 /phpBB/styles/subsilver2 | |
| parent | 63143a1a576b9707dfc997038a5aaf804d5f8d8e (diff) | |
| download | forums-1a0819bdc40fd6b40b556ba1739ae71214719b43.tar forums-1a0819bdc40fd6b40b556ba1739ae71214719b43.tar.gz forums-1a0819bdc40fd6b40b556ba1739ae71214719b43.tar.bz2 forums-1a0819bdc40fd6b40b556ba1739ae71214719b43.tar.xz forums-1a0819bdc40fd6b40b556ba1739ae71214719b43.zip | |
[feature/twig] Changing INCLUDEJS behavior
Was:
<!-- INCLUDEJS template/foo.js -->
Now:
<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/foo.js' -->
Reasons for this:
1. INCLUDEJS is 3.1-dev only
2. INCLUDEJS has odd behavior to begin with (arbitrary setting root path
to styles/name/ directory)
3. INCLUDEJS could not include files from outside directories or anywhere
else
4. It was easier to change INCLUDEJS behavior to something more flexible
and useful than hack around it to make it work as it was with Twig.
PHPBB3-11598
Diffstat (limited to 'phpBB/styles/subsilver2')
| -rw-r--r-- | phpBB/styles/subsilver2/template/timezone_option.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/ucp_groups_manage.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/ucp_profile_avatar.html | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/styles/subsilver2/template/timezone_option.html b/phpBB/styles/subsilver2/template/timezone_option.html index 26ba2388c9..d71166f517 100644 --- a/phpBB/styles/subsilver2/template/timezone_option.html +++ b/phpBB/styles/subsilver2/template/timezone_option.html @@ -15,6 +15,6 @@ {S_TZ_OPTIONS} </select> - <!-- INCLUDEJS template/timezone.js --> + <!-- INCLUDEJS T_TEMPLATE_PATH ~ '/timezone.js' --> </td> </tr> diff --git a/phpBB/styles/subsilver2/template/ucp_groups_manage.html b/phpBB/styles/subsilver2/template/ucp_groups_manage.html index 8064e1e6e9..5595d19b9e 100644 --- a/phpBB/styles/subsilver2/template/ucp_groups_manage.html +++ b/phpBB/styles/subsilver2/template/ucp_groups_manage.html @@ -95,7 +95,7 @@ </tr> </table> -<!-- INCLUDEJS template/avatars.js --> +<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/avatars.js' --> <!-- ELSEIF S_LIST --> diff --git a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html index 697cceabb9..58ef499c41 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html @@ -48,6 +48,6 @@ </tr> </table> -<!-- INCLUDEJS template/avatars.js --> +<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/avatars.js' --> <!-- INCLUDE ucp_footer.html --> |