1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-30 11:11:23 +02:00

3333 Commits

Author SHA1 Message Date
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
Marc Alexander
f27cdad73e
Merge branch '3.1.x' into 3.2.x 2017-02-11 21:48:20 +01:00
Marc Alexander
45199adebd
Merge pull request #4523 from senky/ticket/13429
[ticket/13429] Replace @change with @changed in event docblocks
2017-02-11 15:19:47 +01:00
javiexin
f23d9bf2e0 [ticket/15068] Add template vars retrieval from the template object
PHPBB3-15068
2017-02-05 21:47:31 +01:00
Tristan Darricau
59ad9401d9
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/13250] Use faster str_replace() instead of preg_replace()
  [ticket/13250] Replace slashes in cache file names
2017-02-05 18:11:22 +01:00
Tristan Darricau
1470985ff2
Merge pull request #4660 from marc1706/ticket/13250
[ticket/13250] Replace slashes in cache file names

* marc1706/ticket/13250:
  [ticket/13250] Use faster str_replace() instead of preg_replace()
  [ticket/13250] Replace slashes in cache file names
2017-02-05 18:11:16 +01:00
Tristan Darricau
4eb72a4e7b
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/13601] Add core.acl_clear_prefetch_after event
2017-02-05 18:05:59 +01:00
Tristan Darricau
c3896c8b5d
Merge pull request #4673 from senky/ticket/13601
[ticket/13601] Add core.acl_clear_prefetch_after event

* senky/ticket/13601:
  [ticket/13601] Add core.acl_clear_prefetch_after event
2017-02-05 18:05:53 +01:00
Máté Bartus
16e79d00d1 Merge pull request #4675 from marc1706/ticket/15044
[ticket/15044] Create search index during installation
2017-01-29 14:42:41 +01:00
Máté Bartus
cd4ceb2487 Merge pull request #4677 from marc1706/ticket/15050
[ticket/15050] Use new file when new file already exists
2017-01-29 14:40:02 +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
Marc Alexander
b5ed02d03c [ticket/15050] Remove extra whitespace
PHPBB3-15050
2017-01-27 08:40:35 +01:00
David Colón
2416a743f5 [ticket/15047] Reinstate length check for MSSQL 2000 2017-01-26 18:44:18 -05:00
David Colón
fae78b4c01 [ticket/15047] Do not set default for identity cols 2017-01-26 08:43:39 -05:00
David Colón
c53054f2b7 [ticket/15047] Use brackets due to keyword usage 2017-01-26 08:43:39 -05:00
David Colón
b52ee87df8 [ticket/15047] Don't attempt to drop primary keys 2017-01-26 08:43:39 -05:00
David Colón
66b0fe3b5d [ticket/15047] No index name length check for mssql 2017-01-26 08:43:06 -05:00
Marc Alexander
f66594bf93
[ticket/15050] Use new file when new file already exists
Instead of trying to diff the new file against a pre-existing file,
we're just going to use the new file. It's impossible to know whether
the pre-existing file is newer or older than the new file. As the
system will rely on the files being in the "new" state it's better
to simply use the file in "new" state.

PHPBB3-15050
2017-01-25 22:18:29 +01:00
Marc Alexander
10dee52c18
[ticket/15044] Make sure fulltext native min and max are numbers
PHPBB3-15044
2017-01-24 21:47:37 +01:00
Marc Alexander
a03047da5b
[ticket/15044] Add module task for creating search index during install
PHPBB3-15044
2017-01-24 21:47:20 +01:00
Jakub Senko
d1df78604b
[ticket/13601] Add core.acl_clear_prefetch_after event
PHPBB3-13601
2017-01-23 15:00:59 +01:00
Jakub Senko
779758f219
[ticket/13429] Replace @change with @changed
PHPBB3-13429
2017-01-23 13:33:15 +01:00
tas2580
9df6ef5735
Use SSL in version check for extension
PHPBB3-15025
2017-01-22 23:31:41 +01:00
Tristan Darricau
7c77e33313
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14968] Use earlier version as written in comment
  [ticket/14968] Update docblock and ensure method returns array
  [ticket/14968] Display possible upgrade on acp index and update page
  [ticket/14968] Add method for retrieving updates on current branch
2017-01-22 23:15:26 +01:00
Marc Alexander
0238d850dd
[ticket/15015] Use correct explain string for enable email settings
PHPBB3-15015
2017-01-22 20:58:53 +01:00
Marc Alexander
fbff3b77bd
[ticket/13250] Use faster str_replace() instead of preg_replace()
PHPBB3-13250
2017-01-22 17:22:28 +01:00
Marc Alexander
20a4d095de
[ticket/14968] Update docblock and ensure method returns array
PHPBB3-14968
2017-01-22 16:58:37 +01:00
Marc Alexander
0572d6e33a
[ticket/14968] Add method for retrieving updates on current branch
PHPBB3-14968
2017-01-22 16:09:51 +01:00
Marc Alexander
6c09910c10
[ticket/13250] Replace slashes in cache file names
PHPBB3-13250
2017-01-21 11:21:38 +01:00
Tristan Darricau
43ba6783c5
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/15011] Output meaningful errors when validating all metadata
2017-01-15 18:16:36 +01:00
Marc Alexander
a0bd23b747
[ticket/15011] Output meaningful errors when validating all metadata
PHPBB3-15011
2017-01-15 17:56:12 +01:00
Tristan Darricau
2637606ae1
Merge pull request #4631 from JoshyPHP/ticket/14985
[ticket/14985] Decode HTML special chars in plain text columns

* JoshyPHP/ticket/14985:
  [ticket/14985] Added functional tests for BBCodes and smilies
  [ticket/14985] Decode HTML special chars in plain text columns
2017-01-15 12:08:01 +01:00
Tristan Darricau
d6e42ec63b
[ticket/15011] Fix 3.2.x merge
PHPBB3-15011
2017-01-15 12:00:36 +01:00
Tristan Darricau
935da1ed2b
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/15011] Error not checked on metadata load failure
2017-01-15 11:58:04 +01:00
Tristan Darricau
c3b7332ea8
Merge pull request #4646 from javiexin/ticket/15011
[ticket/15011] Error not checked on metadata load failure

* javiexin/ticket/15011:
  [ticket/15011] Error not checked on metadata load failure
2017-01-15 11:58:00 +01:00
Tristan Darricau
0b5218cec1
Merge pull request #4647 from marc1706/ticket/15012
[ticket/15012] Use valid constructor in ftp_file_updater

* marc1706/ticket/15012:
  [ticket/15012] Use valid constructor in ftp_file_updater
2017-01-15 11:25:55 +01:00
Marc Alexander
42e78004fb
Merge pull request #4643 from JoshyPHP/ticket/15008
[ticket/15008] Disable emoji when smilies are disabled
2017-01-15 00:25:28 +01:00
Marc Alexander
abf7a4f663
[ticket/15012] Use valid constructor in ftp_file_updater
PHPBB3-15012
2017-01-14 22:48:24 +01:00
javiexin
b9189ec325 [ticket/15011] Error not checked on metadata load failure
PHPBB3-15011
2017-01-14 18:08:23 +01:00
Richard McGirr
02b5873442 [ticket/15010] Fix incorrect use of request
https://tracker.phpbb.com/browse/PHPBB3-15010

PHPBB3-15010
2017-01-14 09:18:55 -05:00
JoshyPHP
15315ac87a [ticket/15008] Disable emoji when smilies are disabled
Will effectively disable emoji shortname and won't replace emoji
with images but will not prevent a browser or OS from displaying
emoji as images.

PHPBB3-15008
2017-01-14 14:27:38 +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
JoshyPHP
ef215f573e [ticket/14985] Decode HTML special chars in plain text columns
PHPBB3-14985
2017-01-12 09:30:52 +01:00
Marc Alexander
26c6cb819e
Merge pull request #4625 from Nicofuma/ticket/14973
[ticket/14973] Add BC layer for \phpbb\db\tools
2017-01-08 20:53:53 +01:00
Tristan Darricau
aaee7c7db9
Merge pull request #4623 from rxu/ticket/14971
[ticket/14971] Fix pagination PHP warning on PHP 7.1

* rxu/ticket/14971:
  [ticket/14971] Add on_page test with the string arguments
  [ticket/14971] Fix pagination PHP warning on PHP 7.1
2017-01-08 18:35:22 +01:00