1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-25 16:49:58 +02:00

202 Commits

Author SHA1 Message Date
Tristan Darricau
2d26fd5b0c Merge branch '3.2.x'
* 3.2.x:
  [ticket/15659] Fix retrieve_block_vars()
2018-07-08 18:43:17 +02:00
Tristan Darricau
7f76d91128 Merge pull request #5249 from senky/ticket/15659
[ticket/15659] Fix retrieve_block_vars()

* github.com:/phpbb/phpbb:
  [ticket/15659] Fix retrieve_block_vars()
2018-07-08 18:43:16 +02:00
Tristan Darricau
d84af59cad Merge branch '3.2.x'
* 3.2.x:
  [ticket/15666] Fix array key in twig lang() call
2018-07-08 18:42:27 +02:00
Jakub Senko
b5daa91650
[ticket/15659] Fix retrieve_block_vars()
PHPBB3-15659
2018-07-07 15:46:24 +02:00
Jakub Senko
52f5e54d8a
[ticket/15666] Fix array key in twig lang() call
PHPBB3-15666
2018-06-18 11:56:05 +02:00
Marc Alexander
82ccc43767
Merge branch '3.2.x' 2018-01-17 23:06:19 +01:00
Jakub Senko
84ff21a586
[ticket/15099] Remove type attr from INCLUDECSS and INCLUDEJS
PHPBB3-15099
2018-01-17 18:30:21 +01:00
rxu
f8fbe37936
[ticket/14972] replace all occurrences of sizeof() with the count()
PHPBB3-14972
2018-01-01 13:56:04 +01:00
Marc Alexander
ff18802656
[ticket/14972] Fix template context use of sizeof()
PHPBB3-14972
2018-01-01 13:56:04 +01:00
Marc Alexander
c309b4cd8d
Merge branch '3.2.x' 2017-11-01 18:02:14 +01:00
javiexin
a30693a594
[ticket/14994] Refactor template->assign_block_var
Refactor assign_block_var to use the same block selection mechanism
as is used in alter_block_array.  This allows creating new blocks
at any position in the template structure, not only on the last block.
Allows selecting a block as outer[2].middle.
Added tests. Added PHP 7.2 compatibility.

PHPBB3-14994
2017-11-01 12:29:49 +01:00
javiexin
c2043e47da
[ticket/14994] Refactor template->assign_block_var
Refactor assign_block_var to use the same block selection mechanism
as is used in alter_block_array.  This allows creating new blocks
at any position in the template structure, not only on the last block.
Allows selecting a block as outer[2].middle.
Added tests. Added PHP 7.2 compatibility.

PHPBB3-14994
2017-11-01 12:29:49 +01:00
Marc Alexander
e157d8890b
Merge pull request #5020 from marc1706/ticket/15424
[ticket/15424] Multiple typo fixes in docs & comments
2017-11-01 12:27:13 +01:00
Marc Alexander
0c009e3feb
Merge pull request #4959 from rubencm/ticket/15366
[ticket/15366] Remove useless code
2017-10-29 22:09:49 +01:00
luzpaz
e13ba99c81
[ticket/15424] Multiple typo fixes in docs & comments
Fixed typos in some docs, guidelines, some non-user-facing files.

PHPBB3-15424
2017-10-29 12:44:01 +01:00
javiexin
e32324c72a
[ticket/14994] Refactor template->assign_block_var
Refactor assign_block_var to use the same block selection mechanism
as is used in alter_block_array.  This allows creating new blocks
at any position in the template structure, not only on the last block.
Allows selecting a block as outer[2].middle.

PHPBB3-14994
2017-10-29 11:06:18 +01:00
Rubén Calvo
eaeec9b50b [ticket/15377] Use __DIR__ constant
PHPBB3-15377
2017-10-09 12:31:57 +02:00
Rubén Calvo
18c5f5c6e8 [ticket/15377] Fix INCLUDECSS and INCLUDEJS
PHPBB3-15377
2017-10-05 20:54:01 +02:00
Rubén Calvo
7b4c355190 [ticket/15366] Remove useless code
PHPBB3-15366
2017-09-16 12:30:36 +02:00
Rubén Calvo
c5f3dec2f2 [ticket/15289] Update acp storage
PHPBB3-15289
2017-09-08 16:25:18 +02:00
Rubén Calvo
04a34d9f4f [ticket/15289] Use macros to generate form
PHPBB3-15289
2017-09-08 16:22:10 +02:00
Rubén Calvo
c3c8117f0a [ticket/15289] Update acp to be able to save data in the database
PHPBB3-15289
2017-09-08 16:22:10 +02:00
Rubén Calvo
19b99a0770 [ticket/15289] Add twig extension to generate inputs from the template
PHPBB3-15289
2017-09-08 16:22:10 +02:00
Rubén Calvo
c87b94133c [ticket/15330] Fix typo
PHPBB3-15330
2017-09-08 14:39:04 +02:00
Rubén Calvo
21f3c53882 [ticket/15330] Twig function to know if a language string is defined
PHPBB3-15330
2017-09-08 11:56:20 +02:00
Rubén Calvo
b1755d9dac [ticket/15253] Update imports
PHPBB3-15253
2017-07-20 19:55:52 +02:00
Rubén Calvo
603a8c51da [ticket/15253] Move storage helper to filesystem
PHPBB3-15253
2017-07-20 19:55:52 +02:00
Rubén Calvo
ecb79539f4 [ticket/15253] Use storage helper methods instead of filesystem methods
PHPBB3-15253
2017-07-20 19:55:52 +02:00
rxu
797234e416 [ticket/14972] replace all occurrences of sizeof() with the count()
PHPBB3-14972
2017-07-17 16:57:00 +07:00
rxu
67a65e3788 [ticket/14972] Fix find_key_index method
PHPBB3-14972
2017-07-17 16:56:58 +07:00
Marc Alexander
a079c5fed0
Merge branch 'ticket/15178' into ticket/15179 2017-05-31 20:20:43 +02:00
Marc Alexander
7dc288cb89 Merge remote-tracking branch 'javiexin/ticket/15068' into 3.2.x 2017-05-29 12:13:41 +02:00
rxu
fcc8e155ec [ticket/14990] Move dispatcher object to the front of the options array
PHPBB3-14990
2017-04-16 23:40:16 +07:00
rxu
1ea114ca20 [ticket/14990] Fix event name, email parsing, installer and dispatcher calls
PHPBB3-14990
2017-04-16 22:43:50 +07:00
rxu
633bbc9c6d [ticket/14990] Add core events to the Twig environment
PHPBB3-14990
2017-04-16 22:43:49 +07:00
Marc Alexander
269150ed40
Merge pull request #4612 from javiexin/ticket/14950
[ticket/14950] Add possibility to delete a template block
2017-04-15 18:18:32 +02:00
javiexin
bd12504f6c Merge branch '3.2.x' into ticket/15068 2017-03-09 16:12:25 +01:00
javiexin
96a90d3f81 [ticket/15068] Add template vars retrieval from the template object
Add possibility to retrieve full block of vars

PHPBB3-15068
2017-03-09 16:05:39 +01:00
Marc Alexander
7a1f4d5008
Merge branch '3.1.x' into 3.2.x 2017-02-23 22:21:20 +01:00
Marc Alexander
9267235f30
Merge pull request #4605 from javiexin/ticket/14943
[ticket/14943] Fix template loop access by index
2017-02-23 22:21:16 +01:00
Marc Alexander
bdaa6e4909
Merge branch '3.1.x' into 3.2.x 2017-02-19 21:47:06 +01:00
Marc Alexander
481a592b8d
Merge pull request #4598 from javiexin/ticket/14944
[ticket/14944] Add search for template loop indexes by key
2017-02-19 21:47:00 +01:00
javiexin
f23d9bf2e0 [ticket/15068] Add template vars retrieval from the template object
PHPBB3-15068
2017-02-05 21:47:31 +01:00
javiexin
849fd9df7d [ticket/14944] Add possibility to search for template loop indexes by key
Adds a new function to the template interface, and implements it in the
context class.  The function returns the ordinal index for a specified key,
with the same structure that the key for alter_block_array.
Reuses same code. Remove unneeded references, do nothing for int keys.
Check out of bounds or wrong blockname errors.  Added tests.
Remove default parameter value.

PHPBB3-14944
2017-01-28 21:34:08 +01:00
javiexin
136c74bd1c [ticket/14950] Add possibility to delete a template block
Adds a new mode to alter_block_array to allow for the deletion of
a certain block of template variables.  The selection method is the
same as for the other modes for alter_block_array.  The passed in
vararray is ignored, and an out of bounds index is considered an error.
Added tests for the new function, fixed.

PHPBB3-14950
2017-01-12 21:28:58 +01:00
javiexin
d2ad751851 [ticket/14943] Fix template loop access by index
Allows inserting elements in a loop specified as 'outer[3].inner'.
This was coded, but malfunctioning.  Name incorrectly set on insert.
If block was empty, the insertion process should create it.
Checking for out of bounds indexes.

PHPBB3-14943
2017-01-12 21:25:39 +01:00
javiexin
20c03cccdd [ticket/14944] Add possibility to search for template loop indexes by key
Adds a new function to the template interface, and implements it in the
context class.  The function returns the ordinal index for a specified key,
with the same structure that the key for alter_block_array.
Reuses same code. Remove unneeded references, do nothing for int keys.
Check out of bounds or wrong blockname errors.  Added tests.

PHPBB3-14944
2017-01-08 00:00:47 +01:00
Marc Alexander
166320ef9e
Merge branch '3.1.x' into 3.2.x 2017-01-06 15:29:40 +01:00
rxu
49c19a267f [ticket/14958] Optimize Twig extension lang() function
PHPBB3-14958
2017-01-05 00:42:27 +07:00
javiexin
92708b2905 [ticket/14950] Add possibility to delete a template block
Adds a new mode to alter_block_array to allow for the deletion of
a certain block of template variables.  The selection method is the
same as for the other modes for alter_block_array.  The passed in
vararray is ignored, and an out of bounds index is considered an error.

PHPBB3-14944
2017-01-04 00:36:23 +01:00