Commit graph

13165 commits

Author SHA1 Message Date
Oleg Pudeyev
2aec6bb07c [feature/template-engine] Only copy files to cache if they exist.
When testing eval code path, compiled templates may not be written
to the file system, and unconditionally trying to copy them
breaks tests.

PHPBB3-9726
2011-05-01 03:12:23 -04:00
Oleg Pudeyev
b884573c1d [feature/template-engine] Relax missing file exception check.
As long as the exception message has the correct description and
file name we should not care which function raised the exception.

PHPBB3-9726
2011-05-01 03:11:13 -04:00
Oleg Pudeyev
c844a277b2 [feature/template-engine] Check return value of display() in assign_display().
If display() failed, propagate the failure out of assign_display().

PHPBB3-9726
2011-05-01 03:09:49 -04:00
rxu
5254ec2795 [ticket/6712] Add phpbb_ function name prefix, more docs, rename current_time
PHPBB3-6712
2011-05-01 13:38:39 +08:00
Oleg Pudeyev
a4a9e38007 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9961] Create log entries when users are activated.
2011-04-30 20:44:42 -04:00
Oleg Pudeyev
aa7be58d41 Merge branch 'erikfrerejean/ticket/9961' into develop-olympus
* erikfrerejean/ticket/9961:
  [ticket/9961] Create log entries when users are activated.
2011-04-30 17:41:04 -04:00
Oleg Pudeyev
8155bc5a9d [ticket/10067] Clarify language for user activation options in ACP.
PHPBB3-10067
2011-04-30 15:39:19 -04:00
Oleg Pudeyev
820f22f784 [ticket/9693] Removed useless $auth globalizations.
PHPBB3-9693
2011-04-30 13:20:27 -04:00
Oleg Pudeyev
1e2c19f4b4 [ticket/10003] Delete EOL at EOF for the benefit of 3.0 modifications.
PHPBB3-10003
2011-04-29 02:16:02 -04:00
Oleg Pudeyev
85549fad83 [ticket/10003] Ported 1802b9ff92 to db_tools.
Most of it was already in db_tools, these changes could have applied to
code that did not exist in db_tools at the time of the commit.

PHPBB3-10003
2011-04-29 02:10:42 -04:00
Oleg Pudeyev
55ff5da70b [ticket/10003] Ported 5553cfc2ed to db_tools.
The diff in database_update was only partially relevant.

PHPBB3-10003
2011-04-29 02:10:42 -04:00
Oleg Pudeyev
761e3dd36f [ticket/10003] Ported 023760c8b2 to db_tools.
This was painful. Git wanted to patch hunks in wrong places.
Hopefully I got it right.

PHPBB3-10003
2011-04-29 02:10:42 -04:00
Oleg Pudeyev
9f34aa0b79 [ticket/10003] Ported 54c22ae52a to db_tools.
This diff applied cleanly.

PHPBB3-10003
2011-04-29 02:10:42 -04:00
Oleg Pudeyev
3cb1b90ca6 [ticket/10003] Ported 96a30afcca to db_tools.
This change is somewhat questionable, maybe it should be reviewed.

PHPBB3-10003
2011-04-29 02:10:41 -04:00
Oleg Pudeyev
e6eb11bb11 [ticket/10003] Ported d7d96223e7 to db_tools.
PHPBB3-10003
2011-04-29 02:10:41 -04:00
Oleg Pudeyev
909ee59871 [feature/template-engine] Removed $this from new phpbb_template_compile calls.
The compile class no longer takes template as a parameter.

PHPBB3-9726
2011-04-26 22:19:04 -04:00
Igor Wiedler
835391c83a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.
2011-04-26 21:49:31 +02:00
Igor Wiedler
850741ee16 Merge remote branch 'bantu/ticket/10145' into develop-olympus
* bantu/ticket/10145:
  [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.
2011-04-26 21:49:21 +02:00
Andreas Fischer
9a4e71ac1a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/7941] Added @return to generate_board_url docstring.
2011-04-26 19:36:48 +02:00
Andreas Fischer
569a4b2091 Merge remote branch 'p/ticket/7941' into develop-olympus
* p/ticket/7941:
  [ticket/7941] Added @return to generate_board_url docstring.
2011-04-26 19:35:49 +02:00
Andreas Fischer
a3a70e13b5 [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.
PHPBB3-10145
2011-04-26 12:35:44 +02:00
Igor Wiedler
427a5122d5 [feature/template-engine] Fix negative variable expressions
compile_tag_if had the flawed approach of adding an isset statement for
all variables to the beginning of the if. This fails for negative
expressions, and checking those takes a considerable effort.

The easier solution is to make the variable expression itself
conditional, defaulting to null if it is not set.

Thanks to naderman for the solution.

PHPBB3-9726
2011-04-25 23:19:36 -04:00
Oleg Pudeyev
f0b97cfdcf [feature/template-engine] Added a test for reuse of loop identifiers.
This currently does not pass, thus it is commented out.

The reuse appears implausible in the same file, however it may be
also done across template files where it is much harder to detect.

PHPBB3-9726
2011-04-25 23:19:32 -04:00
Oleg Pudeyev
f97411b911 [feature/template-engine] Corrected miscompilation of loop size constructs.
PHPBB3-9726
2011-04-25 23:19:25 -04:00
Oleg Pudeyev
8d5e468eb4 [feature/template-engine] Created a script to compile templates.
Script takes path to template as the only argument and outputs
the compiled template to standard output.

PHPBB3-9726
2011-04-24 23:13:44 -04:00
Oleg Pudeyev
5afc0b9b90 [feature/template-engine] Corrected an off-by-one error in nested namespaces.
This error resulted in a dot from the namespace being placed into
variable reference in compiled template code, thus creating bogus
compiled template code.

PHPBB3-9726
2011-04-24 23:13:13 -04:00
Oleg Pudeyev
e10d62badc [feature/template-engine] Added a test for multilevel references in loops.
This currently fails.

This test is a reduced version of permission_mask template in acp, which
is not correctly compiled by the current template engine code.

PHPBB3-9726
2011-04-24 21:56:26 -04:00
Oleg Pudeyev
5c3ebb3465 [feature/template-engine] Deleted silencing of notices.
The code is now supposed to be notice-free, therefore there is no need
to have the notices silenced.

PHPBB3-9726
2011-04-24 21:22:43 -04:00
Oleg Pudeyev
a2c75f6053 [feature/template-engine] Deleted $template from phpbb_template_compile class.
phpbb_template_compile is now much simpler. It takes complete file paths
as inputs, either source template path or source template path and output
compiled template path. The number of methods also went down to two -
compile template and returned compiled text or compile and write to file.

phpbb_compile class is responsible for determining source and compiled
paths. It already had all the data necessary for this, now the code is
in the same place as the data it uses.

PHPBB3-9726
2011-04-24 21:18:18 -04:00
Oleg Pudeyev
8fc748770a Merge branch 'feature/rxu/attachment-management-no-reassignment' into develop
* feature/rxu/attachment-management-no-reassignment:
  [feature/attachment-management-no-reassignment] Handle privacy and some more.
  [feature/attachment-management-no-reassignment] Further feature adjustments.
  [feature/attachment-management-no-reassignment] Fix some more errors
  [feature/attachment-management-no-reassignment] Fix minor flaws in the code.
  [feature/attachment-management-no-reassignment] Attachments management
2011-04-24 14:29:59 -04:00
rxu
baba66a229 [feature/attachment-management-no-reassignment] Handle privacy and some more.
- restrict files info for PM attachments;
- add an option to resync files stats if wrong;
- replace post_id sorting with post type (PM/regular post) one;
- some language fixes.

PHPBB3-9721
2011-04-24 23:33:51 +08:00
Andreas Fischer
026358ec72 Merge remote branch 'p/ticket/10148' into develop
* p/ticket/10148:
  [ticket/10148] Turn TEMPLATE_BITFIELD into an instance variable.
2011-04-24 17:31:45 +02:00
Andreas Fischer
1ec2ab6689 Merge remote branch 'p/ticket/10143' into develop
* p/ticket/10143:
  [ticket/10143] Added tests for storing a previously deleted value in db cache.
2011-04-24 17:31:33 +02:00
Igor Wiedler
81962d1d8f [ticket/9924] Pass template instance into $template->display hook
This is a cherry-pick of 053cf790a9
which appears to have been partially reverted here.

PHPBB3-9924
2011-04-24 11:23:46 -04:00
Oleg Pudeyev
c8db531fcb [feature/template-engine] Removed a useless space.
PHPBB3-9726
2011-04-24 01:59:40 -04:00
Oleg Pudeyev
dfbbc4797e [ticket/10148] Turn TEMPLATE_BITFIELD into an instance variable.
PHPBB3-10148
2011-04-24 01:35:09 -04:00
Oleg Pudeyev
321ecf4273 [feature/template-engine] Delete class_exists checks, rely on autoloading.
PHPBB3-9726
2011-04-24 01:18:58 -04:00
Oleg Pudeyev
f29f32e0d6 [feature/template-engine] Allow leading underscores in variable names.
Subsilver uses ._file in overall_header.

PHPBB3-9726
2011-04-24 01:08:48 -04:00
Oleg Pudeyev
203187a841 [feature/template-engine] Fix recompilation logic.
Do not change $recompile from true to false - any recompilation
condition alone is sufficient to force recompilation.

Also uncomment the nonexistent file test which passes with this fix.

PHPBB3-9726
2011-04-24 01:08:48 -04:00
Oleg Pudeyev
4dfe4c7f13 [feature/template-engine] Adjust path in includephp template.
Now that tests are run from top level the '..' is wrong.

PHPBB3-9726
2011-04-24 01:08:30 -04:00
Oleg Pudeyev
4f3e966fdc [feature/template-engine] Delete ?>, add newline at EOF.
PHPBB3-9726
2011-04-23 22:49:08 -04:00
Marek A. Ruszczynski
2d11e1c095 [feature/template-engine] Improved template engine.
PHPBB3-9726
2011-04-23 22:49:02 -04:00
Marek A. Ruszczynski
4b646c6c80 [feature/template-engine] Update tests.
PHPBB3-9726
2011-04-23 22:48:50 -04:00
Andreas Fischer
513b95642e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10147] Corrected a typo in includes/functions_template.php.
2011-04-23 21:52:04 +02:00
Andreas Fischer
8a97722464 Merge branch 'ticket/p/10147' into develop-olympus
* ticket/p/10147:
  [ticket/10147] Corrected a typo in includes/functions_template.php.
2011-04-23 21:51:49 +02:00
Oleg Pudeyev
a8ecd30fe1 [ticket/10147] Corrected a typo in includes/functions_template.php.
PHPBB3-10147
2011-04-23 15:36:45 -04:00
Andreas Fischer
ca0a066854 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10141] Save a hash lookup when value is not in cache.
  [ticket/10141] Split double-assignment into conditional and unconditional part.
  [ticket/10141] Use a cache in $auth->_fill_acl() for better performance.
2011-04-22 11:17:39 +02:00
Andreas Fischer
bc48fe1704 Merge branch 'ticket/p/10141' into develop-olympus
* ticket/p/10141:
  [ticket/10141] Save a hash lookup when value is not in cache.
  [ticket/10141] Split double-assignment into conditional and unconditional part.
  [ticket/10141] Use a cache in $auth->_fill_acl() for better performance.
2011-04-22 11:16:32 +02:00
Andreas Fischer
9cb6a69861 [ticket/10146] Firebird: 1 <= precision <= 18 ==> Cast to DECIMAL(18, 0).
PHPBB3-10146
2011-04-22 11:01:07 +02:00
Oleg Pudeyev
f08880e2c4 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN.
2011-04-22 00:16:37 -04:00