aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/template
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'p/feature/template-events' into developDavid King2012-12-104-10/+185
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (36) and others # Via Oleg Pudeyev * p/feature/template-events: (47 commits) [feature/template-events] Pass arguments in correct order. [feature/template-events] Order extensions in mock extension manager. [feature/template-events] Changes per imkingdavid's review. [feature/template-events] Make style names private on template. [feature/template-events] Test for event that is defined in parent style only. [feature/template-events] Specify style names, add inheritance tests. [feature/template-events] Normalize expected directory trees. [feature/template-events] Allow dataset to be correctly selectable. [feature/template-events] Dataset for template event testing with inheritance. [feature/template-events] Use style names array in template filter. [feature/template-events] Generate style names array in set_style. [feature/template-events] Convert a single style name to array of them. [feature/template-events] Chase dependency injection for template context. [feature/template-events] Adjust template events test to use the dataset. [feature/template-events] Create a dataset for template event tests. [feature/template-events] Indentation fix. [feature/template-events] Cosmetic changes. [feature/template-events] Wording: wrongly -> improperly. [feature/template-events] Indentation fix. [feature/template-events] Rename template_name to style_name. ...
| * [feature/template-events] Changes per imkingdavid's review.Oleg Pudeyev2012-11-173-4/+15
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Make style names private on template.Oleg Pudeyev2012-11-171-1/+13
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Use style names array in template filter.Oleg Pudeyev2012-11-171-5/+13
| | | | | | | | | | | | | | This provides a straightforward way of iterating over all styles looking for templates in extensions. PHPBB3-9550
| * [feature/template-events] Convert a single style name to array of them.Oleg Pudeyev2012-11-173-16/+14
| | | | | | | | | | | | | | This allows template code to know the entire style hierarchy for templates being rendered. PHPBB3-9550
| * [feature/template-events] Indentation fix.Nathan Guse2012-11-171-3/+6
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Cosmetic changes.Oleg Pudeyev2012-11-172-4/+4
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Wording: wrongly -> improperly.Nathan Guse2012-11-171-2/+2
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Indentation fix.Nathan Guse2012-11-171-1/+1
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Rename template_name to style_name.Oleg Pudeyev2012-11-173-17/+18
| | | | | | | | | | | | | | "Style name" makes a lot more sense and should be in line with recent style/template changes. PHPBB3-9550
| * [feature/template-events] Report when templates cannot be compiled.Oleg Pudeyev2012-11-171-0/+4
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Update EVENT tag documentation.Oleg Pudeyev2012-11-171-1/+21
| | | | | | | | | | | | It should now fairly closely reflect what actually happens. PHPBB3-9550
| * [feature/template-events] Delete old comments/test code.Oleg Pudeyev2012-11-171-7/+0
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Move comment to the function docblock.Oleg Pudeyev2012-11-171-3/+3
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Handle user access correctly.Oleg Pudeyev2012-11-172-3/+21
| | | | | | | | | | | | | | | | Pass through $user from template to filter. Allow $user to be null for standalone usage of the template engine. PHPBB3-9550
| * [feature/template-events] Always commit suicide for invalid event names.Oleg Pudeyev2012-11-171-9/+2
| | | | | | | | | | | | | | | | | | Note: suicide happens for syntactically invalid event names, e.g. event names containing punctuation. Event names for which there are no events are silently dropped. PHPBB3-9550
| * [feature/template-events] Chase template/style renames and changes.Oleg Pudeyev2012-11-171-1/+1
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Fix typo (waring -> warning)Erik Frèrejean2012-11-171-1/+1
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Add additional space for editorsErik Frèrejean2012-11-171-1/+1
| | | | | | | | | | | | | | Use `' ?'. '>'` rather than `' ?>'` as the latter causes problems in some editors. PHPBB3-9550
| * [feature/template-events] Remove commentErik Frèrejean2012-11-171-1/+0
| | | | | | | | | | | | Remove comment per Nils in the PR. PHPBB3-9550
| * [feature/template-events] Handle incorrect template event identifiersErik Frèrejean2012-11-171-2/+10
| | | | | | | | | | | | | | | | If the template event identifier is wrongly formatted phpBB will triggern an `E_USER_NOTICE` if the `DEBUG` constant is set, otherwise the location is ignored. PHPBB3-9550
| * [feature/template-events] RUNHOOKS -> EVENTErik Frèrejean2012-11-171-1/+1
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Correct indentationNathan Guse2012-11-171-1/+1
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Rename RUNHOOKS to EVENTMichael Cullum2012-11-171-3/+3
| | | | | | | | | | | | Rename the way to add template events PHPBB3-9550
| * [feature/template-events] PHP does not parse <?php?>, avoid generating it.Oleg Pudeyev2012-11-171-1/+3
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Invoke template hooks that are template-specific.Oleg Pudeyev2012-11-171-0/+7
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Pass top-level template name to template filter.Oleg Pudeyev2012-11-173-3/+26
| | | | | | | | | | | | This will be used to invoke template-specific hooks. PHPBB3-9550
| * [feature/template-events] Add template_compile to template filter params.Oleg Pudeyev2012-11-171-0/+1
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Rename universal to all (for template fragments).Oleg Pudeyev2012-11-171-1/+1
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Fix property name for extension manager.Oleg Pudeyev2012-11-171-2/+2
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Really basic template hook implementation.Oleg Pudeyev2012-11-171-0/+20
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Inject template compile into template filter.Oleg Pudeyev2012-11-171-0/+8
| | | | | | | | | | | | | | This is needed for hooks in order for the filter to compile template files from extensions. PHPBB3-9550
| * [feature/template-events] Inject extension manager into template class.Oleg Pudeyev2012-11-173-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Template class passes extension manager to template compiler. Template compiler passes extension manager to template filter. Template filter will use extension manager to locate hooks as it is compiling templates. All extension manager arguments are optional. If an extension manager is not given, template hooks will not be invoked. PHPBB3-9550
| * [feature/template-events] Outline for RUNHOOKS template tag.Oleg Pudeyev2012-11-171-0/+27
| | | | | | | | | | | | Ported to the new develop, hopefully this is still sensible. PHPBB3-9550
* | [ticket/10103] Convert the rest of the tree to flock class.Oleg Pudeyev2012-12-041-3/+5
| | | | | | | | PHPBB3-10103
* | [ticket/11227] @return void -> @return null, per coding guidelines.Oleg Pudeyev2012-11-301-1/+1
|/ | | | PHPBB3-11227
* Merge remote-tracking branch 'p/ticket/10933' into developIgor Wiedler2012-11-172-80/+47
|\ | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10933: [ticket/10933] Prose for get_first_file_location. [ticket/10933] Remaining documentation for added functions in resource locator [ticket/10933] Update template locator test to use style resource locator. [ticket/10933] Dispose of locate function in template class. [ticket/10933] Add mutators for template_path to style resource locator. [ticket/10933] Delete template_path assignment. [ticket/10933] Delete template_path from template class. [ticket/10933] Add get_first_template_location.
| * [ticket/10933] Prose for get_first_file_location.Oleg Pudeyev2012-11-021-5/+47
| | | | | | | | | | | | | | Also rewrite get_first_template_location prose a little to be less repetitive with get_first_file_location. PHPBB3-10933
| * [ticket/10933] Dispose of locate function in template class.Oleg Pudeyev2012-11-021-54/+0
| | | | | | | | | | | | It had no callers other than the test suite. PHPBB3-10933
| * [ticket/10933] Delete template_path from template class.Oleg Pudeyev2012-11-021-7/+0
| | | | | | | | | | | | template_path is now only present in style resource locator. PHPBB3-10933
| * [ticket/10933] Add get_first_template_location.Oleg Pudeyev2012-11-021-15/+1
| | | | | | | | | | | | | | | | This localizes template_path to style resource locator. locate function on template will be removed in a subsequent commit. PHPBB3-10933
* | Merge remote-tracking branch 'EXreaction/ticket/11189' into developAndreas Fischer2012-11-101-2/+2
|\ \ | | | | | | | | | | | | | | | * EXreaction/ticket/11189: [ticket/11189] Replace DEBUG_EXTRA with DEBUG [ticket/11189] Always log critical errors when in cron or in image output
| * | [ticket/11189] Replace DEBUG_EXTRA with DEBUGNathaniel Guse2012-11-101-2/+2
| |/ | | | | | | PHPBB3-11189
* | Merge pull request #881 from Fyorl/ticket/10970Nils Adermann2012-11-102-16/+51
|\ \ | |/ |/| Allow INCLUDE template macros to accept paths of the form {FOO}/a/{BAR}/c
| * [ticket/10970] Added extra documentation to parse_dynamic_path.Fyorl2012-11-101-1/+2
| | | | | | | | PHPBB3-10970
| * [ticket/10970] Added newline in docblockFyorl2012-08-191-0/+1
| | | | | | | | PHPBB3-10970
| * [ticket/10970] Removed unused $varsFyorl2012-08-101-2/+0
| | | | | | | | PHPBB3-10970
| * [ticket/10970] Fixed a problem with prepending root pathsFyorl2012-07-241-1/+5
| | | | | | | | PHPBB3-10970
| * [ticket/10970] Added missing initialisations and modified the regexFyorl2012-07-241-2/+5
| | | | | | | | | | | | Non-existent variables now become empty strings. PHPBB3-10970
| * [ticket/10970] Added support for forms such as {FOO}bar.{EXT}Fyorl2012-07-081-21/+9
| | | | | | | | PHPBB3-10970