1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-12 12:46:38 +02:00
Commit Graph

90 Commits

Author SHA1 Message Date
318140b4d6 [ticket/10103] Convert the rest of the tree to flock class.
PHPBB3-10103
2012-12-04 02:26:55 -05:00
ec4343c744 [ticket/11227] @return void -> @return null, per coding guidelines.
PHPBB3-11227
2012-11-30 23:03:06 -05:00
b5e069f879 Merge remote-tracking branch 'p/ticket/10933' into develop
* 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.
2012-11-17 19:49:03 +01:00
847feb07e7 Merge remote-tracking branch 'EXreaction/ticket/11189' into develop
* EXreaction/ticket/11189:
  [ticket/11189] Replace DEBUG_EXTRA with DEBUG
  [ticket/11189] Always log critical errors when in cron or in image output
2012-11-10 23:39:00 +01:00
bd37f7f6c0 [ticket/11189] Replace DEBUG_EXTRA with DEBUG
PHPBB3-11189
2012-11-10 10:45:02 -06:00
f0cfae1f01 Merge pull request #881 from Fyorl/ticket/10970
Allow INCLUDE template macros to accept paths of the form {FOO}/a/{BAR}/c
2012-11-10 07:46:50 -08:00
a05f354fdf [ticket/10970] Added extra documentation to parse_dynamic_path.
PHPBB3-10970
2012-11-10 09:36:02 +00:00
7fdab9c5d7 [ticket/10933] Prose for get_first_file_location.
Also rewrite get_first_template_location prose a little to be
less repetitive with get_first_file_location.

PHPBB3-10933
2012-11-02 19:45:02 -04:00
0dd981071b [ticket/10933] Dispose of locate function in template class.
It had no callers other than the test suite.

PHPBB3-10933
2012-11-02 19:39:07 -04:00
97e53103c3 [ticket/10933] Delete template_path from template class.
template_path is now only present in style resource locator.

PHPBB3-10933
2012-11-02 19:37:52 -04:00
615d5ef628 [ticket/10933] Add get_first_template_location.
This localizes template_path to style resource locator.

locate function on template will be removed in a subsequent commit.

PHPBB3-10933
2012-11-02 19:37:52 -04:00
767d09227b [ticket/10933] Dependency inject template context.
PHPBB3-10933
2012-11-02 18:51:35 -04:00
766353fe5c [ticket/10933] Useful documentation for template locate function
PHPBB3-10933
2012-11-02 18:03:52 -04:00
0c18f92c0a [ticket/10933] Typo fixes
PHPBB3-10933
2012-11-02 18:03:52 -04:00
8528d8ff34 [ticket/10933] Initialize template context when template is constructed.
There is no apparent reason for either initializing or clearing
the context in set_style/set_custom_style.

Initially the initialization there was added in
0501640d5d, for reasons that
presently I do not see.

This permits making context property back private.

PHPBB3-10933
2012-11-02 18:03:52 -04:00
8a91598b14 Merge remote-tracking branch 'nickvergessen/ticket/10876' into develop 2012-09-08 15:58:25 -04:00
c20179db72 [ticket/10876] Update regex to a version which still matches our tests
PHPBB3-10876
2012-08-21 11:41:27 +02:00
e9bdca7a8b [ticket/10970] Added newline in docblock
PHPBB3-10970
2012-08-19 17:12:08 +08:00
02ccf392fa [ticket/10970] Removed unused $vars
PHPBB3-10970
2012-08-10 13:42:38 +01:00
86433b5d3b [ticket/10876] Revert "add newline after php tag"-regex back to 3.0 version
The old regex just results in some additional new lines in the output.
So this is only beautifying and considered unworthy in respect to the dying
php servers we observed on windows.

PHPBB3-10876
2012-08-05 00:42:14 +02:00
ae612de663 [ticket/11043] Allow call_hook() to be called from more than one location.
Allow the helper function call_hook() of class phpbb_template to be called
from more than once location and thus for more than one hook (although there is
only one) by adding the method name as a parameter.

PHPBB3-11043
2012-08-03 05:56:49 -05:00
003220dc7c [ticket/10970] Fixed a problem with prepending root paths
PHPBB3-10970
2012-07-24 11:55:38 +01:00
47c67b6d02 [ticket/10970] Added missing initialisations and modified the regex
Non-existent variables now become empty strings.

PHPBB3-10970
2012-07-24 11:54:46 +01:00
85bcdbad46 [ticket/11012] Normalize $phpEx member vars to $php_ext
PHPBB3-11012
2012-07-21 16:19:01 +02:00
d0cb5bb093 [ticket/10970] Added support for forms such as {FOO}bar.{EXT}
PHPBB3-10970
2012-07-08 20:41:22 +01:00
d589623906 [ticket/10970] Paths of the form {FOO}/a/{BAR}/b parsed correctly
A new method to handle this type of path was added and
compile_tag_include, compile_tag_include_php and
compile_tag_include_js were modified to use it appropriately.

Tests were added for these three macros also.

PHPBB3-10970
2012-07-08 20:41:00 +01:00
63b41913a4 [ticket/10799] Removing global variable from includejs
Removing global $phpbb_root_path from includejs implementation

PHPBB3-10799
2012-05-01 18:25:11 +03:00
ed9a58a6cc [ticket/10756] Fixing variable declarations in style and template classes
Fixing variable declaration, removing function from template locator that does not belong there

PHPBB3-10756
2012-04-19 04:25:25 +02:00
d91abbb146 [ticket/10756] Renaming phpbb_style_template to phpbb_template
Renaming phpbb_style_template to phpbb_template

PHPBB3-10756
2012-04-19 04:25:25 +02:00
ea3a2ef223 [ticket/10756] Creating locator interface
Creating locator interface to be used in template class

PHPBB3-10756
2012-04-19 04:15:11 +02:00
ef295a2860 [ticket/10756] Renaming template classes
Renaming template classes from phpbb_style_template_ to phpbb_template_

PHPBB3-10756
2012-04-19 04:15:11 +02:00
733018f99a [ticket/10756] Moving template classes
Moving template class files from includes/style/ to includes/template/ and removing template_ file prefix

PHPBB3-10756
2012-04-19 04:15:11 +02:00
7d414d04ca [feature/merging-style-components] Moving template classes to style
Moving includes/template/ to includes/style/, adding template_ prefix to classes that deal only with templates

PHPBB3-10632
2012-03-14 22:57:58 +02:00
a98117b229 [feature/append_var] Adding append_var template class function
Adding append_var template class function

PHPBB3-10666
2012-03-05 02:41:42 +02:00
5aad71b220 [ticket/10652] Fixing typo in template class
Fixing typo in template class that prevents template inheritance from working

PHPBB3-10652
2012-02-15 18:46:27 +02:00
dd495e7a14 Merge pull request #526 from p/ticket/10500
Ticket/10500 Miscellaneous issues in the new template engine
2012-02-14 15:41:15 -08:00
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00
552df1f6eb [ticket/10500] Use correct class name in @uses.
PHPBB3-10500
2011-12-03 21:15:29 -05:00
7cdc4bba25 [feature/extension-manager] Clear up docs of extension related template changes
PHPBB3-10323
2011-11-18 15:29:32 +01:00
024a5e710e [feature/extension-manager] Correctly reset paths in set_template
PHPBB3-10323
2011-09-29 16:15:54 +02:00
e52022c572 [feature/extension-manager] Make sure named styles are loaded from root dir
PHPBB3-10323
2011-09-29 16:15:54 +02:00
4d08d769c2 [feature/extension-manager] Fallback template might not always be set
PHPBB3-10323
2011-09-29 16:15:53 +02:00
703fcae382 [feature/extension-manager] Reset all template paths after a set_templates call
PHPBB3-10323
2011-09-29 16:15:53 +02:00
520a5f9295 [feature/extension-manager] Refactoring the structure of extension provider
PHPBB3-10323
2011-09-29 16:15:53 +02:00
482a8c47ea [feature/extension-manager] Don't use the extension manager during install
Template needs to be able to work without extensions.

PHPBB3-10323
2011-09-29 16:15:53 +02:00
ea46feb115 [feature/extension-manager] Add support for templates in extensions.
This commit adds a template path provider to separate the process of locating
(cached) paths in extensions from the template engine. The locator is supplied
with a list of paths from the path provider.

Admin templates can now be created in ext/<ext>/adm/style/ and regular
templates go into ext/<ext>/styles/<style>/template/. Extension templates
override regular templates. So if an extension supplies a file with a name
used in phpBB, the extension's file will be used.

A side-effect of this commit: Locator and Provider are now able to deal with
arbitrary levels of template inheritance. So we can expose this through
phpbb_template if we choose to, and allow styles to inherit from inherited
styles.

PHPBB3-10323
2011-09-29 16:15:53 +02:00
af66fbb93b Merge branch 'develop' of git://github.com/phpbb/phpbb3 into develop
* 'develop' of git://github.com/phpbb/phpbb3:
  [ticket/10392] Alter parent namespace stripping.
  [ticket/10392] Test for magic loop variables with nested namespaces.
  [ticket/10392] Missed fix for S_BLOCK_NAME.
  [ticket/10392] Fix access to nested special block variables.
2011-09-27 20:24:16 +02:00
1f14013093 [ticket/10392] Alter parent namespace stripping.
PHPBB3-10392
2011-09-27 01:06:43 +01:00
02a24e2439 [ticket/10392] Missed fix for S_BLOCK_NAME.
PHPBB3-10392
2011-09-27 00:50:53 +01:00
0f589d9ce4 [ticket/10392] Fix access to nested special block variables.
PHPBB3-10392
2011-09-26 20:52:07 +01:00