Marc Alexander
704453b5d1
Merge pull request #6670 from marc1706/ticket/17353-master
...
[ticket/17353] Get gravatar img src and fix incorrect treatment of height -- master version
2024-07-16 21:04:07 +02:00
Marc Alexander
f3e852a20c
Merge branch '3.3.x'
2024-07-15 19:50:40 +02:00
Marc Alexander
651723d6e6
Merge pull request #6690 from rubencm/ticket/15043-master
...
[ticket/15043] Rewrite get_context() [master version]
2024-07-15 19:50:34 +02:00
Marc Alexander
bc7bd15312
Merge pull request #5385 from rubencm/ticket/15043
...
[ticket/15043] Rewrite get_context()
2024-07-15 19:49:59 +02:00
Ruben Calvo
5c40766dc4
[ticket/15403] Remove last element of array only if needed
...
PHPBB-15403
2024-07-15 12:30:40 +02:00
Ruben Calvo
06ff814f04
[ticket/15403] Remove last element of array only if needed
...
PHPBB-15403
2024-07-15 12:30:10 +02:00
Ruben Calvo
d679ac4df8
[ticket/15403] Remove suggestion from composer.json
...
PHPBB-15403
2024-07-14 23:54:01 +02:00
Ruben Calvo
2818ca1309
[ticket/15403] Add another test
...
PHPBB-15403
2024-07-14 22:00:26 +02:00
Ruben Calvo
6b5a632c12
[ticket/15403] Handle ellipsis at the beginning of context and add tests
...
PHPBB-15403
2024-07-14 22:00:26 +02:00
Ruben Calvo
ec8bbf3da3
[ticket/15403] Use substr over the fragment and not the whole text
...
PHPBB-15403
2024-07-14 22:00:26 +02:00
Ruben Calvo
5f0e639b83
[ticket/15403] Refactor get_context
...
PHPBB-15403
2024-07-14 22:00:25 +02:00
Marc Alexander
7181b05e38
[ticket/15043] Small code cleanup
...
PHPBB-15043
2024-07-14 21:59:51 +02:00
Marc Alexander
67ad543135
[ticket/15043] Add unit test for get_context
...
PHPBB-15043
2024-07-14 21:59:51 +02:00
Ruben Calvo
95b8b50599
[ticket/15403] Return first fragment of text if there is no coincidences
...
PHPBB-15403
2024-07-14 21:59:51 +02:00
Ruben Calvo
68436c4a96
[ticket/15403] Fix order of parameters in implode
...
PHPBB-15403
2024-07-14 21:59:51 +02:00
Rubén Calvo
02321c412c
[ticket/15043] Update regexp
...
PHPBB3-15043
2024-07-14 21:59:51 +02:00
Rubén Calvo
13f7a8f82f
[ticket/15043] New get_context displays more text
...
PHPBB3-15043
2024-07-14 21:59:51 +02:00
Rubén Calvo
2f3183796c
[ticket/15043] Rewrite get_context()
...
PHPBB3-15043
2024-07-14 21:59:50 +02:00
Marc Alexander
508d864fcd
Merge branch '3.3.x'
2024-07-14 14:46:23 +02:00
Marc Alexander
de660fe0c8
Merge pull request #6677 from marc1706/ticket/16907
...
[ticket/16907] Adjust request filtering for phpbb paths
2024-07-14 14:46:20 +02:00
Ruben Calvo
e602889213
[ticket/15403] Add another test
...
PHPBB-15403
2024-07-14 12:47:06 +02:00
Ruben Calvo
f4b1444248
[ticket/15403] Handle ellipsis at the beginning of context and add tests
...
PHPBB-15403
2024-07-14 12:45:20 +02:00
Ruben Calvo
dd9267b678
[ticket/15403] Use substr over the fragment and not the whole text
...
PHPBB-15403
2024-07-14 01:10:25 +02:00
Marc Alexander
ca3e692a95
Merge branch '3.3.x'
2024-07-13 19:42:51 +02:00
Marc Alexander
99c97b951f
Merge pull request #6642 from rxu/ticket/17338
...
[ticket/17338] Prefer user_last_active to display user last activity info
2024-07-13 19:42:48 +02:00
Ruben Calvo
f41c8eef47
[ticket/15403] Refactor get_context
...
PHPBB-15403
2024-07-13 17:54:17 +02:00
Marc Alexander
1449706da9
Merge branch '3.3.x'
2024-07-10 22:46:10 +02:00
Marc Alexander
17b4838ee3
Merge pull request #6684 from crowjake/ticket/17365
...
[ticket/17365] Prevent search limit being bypassed with operators
2024-07-10 22:45:09 +02:00
Marc Alexander
6fdf43959f
Merge branch '3.3.x'
2024-07-10 21:34:55 +02:00
Marc Alexander
a0092bdd18
Merge pull request #6678 from marc1706/ticket/13916
...
[ticket/13916] Add notify to fields to store during save draft
2024-07-10 21:34:52 +02:00
Marc Alexander
c0b81a1a48
[ticket/17365] Add a test for max search keywords
...
PHPBB-17365
2024-07-10 21:32:15 +02:00
Marc Alexander
4616681fa8
Merge pull request #6679 from marc1706/ticket/17341
...
[ticket/17341] Remove no longer used files and references
2024-07-09 21:47:45 +02:00
Marc Alexander
89afa0cb5e
[ticket/15043] Small code cleanup
...
PHPBB-15043
2024-07-09 21:46:37 +02:00
Marc Alexander
a62a303318
[ticket/15043] Add unit test for get_context
...
PHPBB-15043
2024-07-09 21:20:09 +02:00
Marc Alexander
b0075b8cce
Merge branch '3.3.x'
2024-07-09 19:22:41 +02:00
Marc Alexander
cacd9375fd
Merge pull request #6685 from danieltj27/ticket/17369
...
[ticket/17369] Add forum id to approve action url for redirection
2024-07-09 19:22:31 +02:00
Ruben Calvo
7763969625
[ticket/15403] Return first fragment of text if there is no coincidences
...
PHPBB-15403
2024-07-09 17:09:06 +02:00
Ruben Calvo
a2e7205154
[ticket/15403] Fix order of parameters in implode
...
PHPBB-15403
2024-07-09 00:25:05 +02:00
Rubén Calvo
350c9213ee
[ticket/15043] Update regexp
...
PHPBB3-15043
2024-07-08 21:43:54 +02:00
Rubén Calvo
7365764476
[ticket/15043] New get_context displays more text
...
PHPBB3-15043
2024-07-08 21:43:52 +02:00
Rubén Calvo
dd4c982792
[ticket/15043] Rewrite get_context()
...
PHPBB3-15043
2024-07-08 21:42:03 +02:00
Daniel James
926a0a4e33
[ticket/17369] Add forum id to approve action url for redirection
...
Added the forum_id to the approve action link which ensures that when
a topic is permanently deleted, the forum_id is present so that it can
be used in the redirection link to go to the previous forum. This addresses
a bug in which the forum_id is not provided and after deleting a topic, the
user will be taken to a 404 page as the forum id fallbacks to 0.
PHPBB-17369
2024-07-08 16:35:41 +01:00
crowjake
30144052da
[ticket/17365] Prevent keyword limit being bypassed with the use of +, - and |
...
Provided `$countable_keywords` wherein the existing `$keywords` value is
modified so that any `-`, `+` and `|` characters without preceding spaces
is replaced with the same but with a space in front of each.
These spaces allow the string to be more accurately split when used instead
of $keywords inside the $num_keywords calculation.
This prevents the word limit being bypassed in search by the use of
operators without whitespace.
PHPBB-17365
2024-07-07 23:04:19 +01:00
Marc Alexander
53e7e3d801
[ticket/17341] Remove no longer used files and references
...
PHPBB-17341
2024-07-07 08:44:32 +02:00
Marc Alexander
187a4f3586
Merge pull request #6671 from iMattPro/ticket/17364
...
[ticket/17364] Correctly handle styles list in ACP Forums
2024-07-07 08:25:30 +02:00
Marc Alexander
ffc655a1ba
[ticket/13916] Add notify to fields to store during save draft
...
PHPBB-13916
2024-07-06 21:44:06 +02:00
Marc Alexander
922e7699ed
[ticket/16907] Adjust request filtering for phpbb paths
...
PHPBB-16907
2024-07-06 17:39:49 +02:00
Marc Alexander
b6ac913933
Merge branch '3.3.x'
2024-07-06 13:02:32 +02:00
Marc Alexander
c790e81fb6
Merge pull request #6676 from marc1706/ticket/16890
...
[ticket/16890] Deny access to config file and folder in nginx sample
2024-07-06 13:01:50 +02:00
Marc Alexander
42851d0d9f
[ticket/16890] Add rewrite for installer in lighttpd
...
PHPBB-16890
2024-07-06 11:53:21 +02:00
