Marc Alexander
08ee5a608b
Merge branch '3.2.x' into 3.3.x
2019-08-11 17:36:24 +02:00
Marc Alexander
48522fd938
Merge pull request #5643 from dark-1/ticket/16113
...
[ticket/16113] Add core.mcp_topic_modify_sql_ary
2019-08-11 17:36:19 +02:00
Marc Alexander
0cbf06780e
Merge branch '3.2.x' into 3.3.x
2019-08-11 17:24:16 +02:00
Marc Alexander
fe052fccd4
Merge pull request #5642 from dark-1/ticket/16114
...
[ticket/16114] mcp_topic_post_author_full_{append/prepend}
2019-08-11 17:24:11 +02:00
Marc Alexander
96335c0402
Merge branch '3.2.x' into 3.3.x
2019-08-11 17:15:50 +02:00
Marc Alexander
0854c7226d
Merge pull request #5651 from 3D-I/ticket/15897
...
[ticket/15897] Fix Emojis' SQL Error in Attachment Comment
2019-08-11 17:15:46 +02:00
Marc Alexander
bf6f1cac8f
Merge branch '3.2.x' into 3.3.x
2019-08-11 17:10:37 +02:00
Marc Alexander
5fe3719f13
Merge pull request #5634 from dark-1/ticket/16111
...
[ticket/16111] Add core.message_history_modify_sql_ary
2019-08-11 17:10:32 +02:00
3D-I
d18e547332
[ticket/15897] Fix Emojis' SQL Error in Attachment Comment
...
PHPBB3-15897
2019-08-10 21:02:45 +02:00
Marc Alexander
4ad288c544
Merge branch '3.2.x' into 3.3.x
2019-08-09 13:27:10 +02:00
Marc Alexander
997098d02a
Merge pull request #5649 from marc1706/ticket/16126
...
[ticket/16126] Downgrade chocolatey to a working version
2019-08-09 13:27:05 +02:00
Marc Alexander
6e75b8bb3c
[ticket/16126] Downgrade chocolatey to a working version
...
PHPBB3-16126
2019-08-09 11:09:58 +02:00
Dark❶
2975eef976
[ticket/16114] mcp_topic_post_author_full_{append/prepend}
...
PHPBB3-16114
2019-08-07 21:05:07 +05:30
Dark❶
159c1d16d8
[ticket/16114] mcp_topic_post_author_full_{append/prepend}
...
PHPBB3-16114
2019-08-07 20:58:22 +05:30
Marc Alexander
9cb22f008d
Merge branch '3.2.x' into 3.3.x
2019-08-07 14:25:17 +02:00
Marc Alexander
c86e771dfe
Merge pull request #5647 from 3D-I/ticket/16119
...
[ticket/16119] Prevent error message for Poll Title
2019-08-07 14:25:12 +02:00
3D-I
ed7b44d59e
[ticket/16119] Prevent error message for Poll Title
...
PHPBB3-16119
2019-08-06 02:17:13 +02:00
Marc Alexander
d880443ea2
Merge branch '3.2.x' into 3.3.x
2019-07-31 07:50:23 +02:00
Marc Alexander
5307da11b6
Merge pull request #5641 from EA117/ticket/16040
...
[ticket/16040] Forum list won't display topic icons containing a space.
2019-07-31 07:50:16 +02:00
Marc Alexander
b4d4709726
Merge pull request #5644 from marc1706/ticket/16115
...
[ticket/16115] Add PHP 7.4snapshot to travis CI build matrix
2019-07-30 20:42:22 +02:00
Derky
2f85fc53dc
Merge branch '3.2.x' into 3.3.x
2019-07-30 07:39:16 +02:00
Derky
6ada02b060
Merge pull request #5628 from marc1706/ticket/16101
...
[ticket/16101] Add Referrer-Policy header to phpBB's headers
2019-07-30 07:34:13 +02:00
Marc Alexander
90722a3c66
Merge branch '3.2.x' into 3.3.x
2019-07-29 21:45:18 +02:00
Marc Alexander
a02524e7fc
Merge pull request #5633 from kasimi/ticket/16108
...
[ticket/16108] Add topiclist_row_topic_by_author_before|after
2019-07-29 21:45:13 +02:00
Marc Alexander
2e634e9f96
Merge branch '3.2.x' into 3.3.x
2019-07-29 21:43:37 +02:00
Marc Alexander
207b678896
Merge pull request #5632 from kasimi/ticket/16107
...
[ticket/16107] Add mcp_move_destination_forum_before|after
2019-07-29 21:43:32 +02:00
Marc Alexander
e086d4039e
Merge branch '3.2.x' into 3.3.x
2019-07-29 21:38:18 +02:00
Marc Alexander
51205febe3
Merge pull request #5635 from EA117/ticket/16066
...
[ticket/16066] Fix FORM_INVALID always returned for banned user.
2019-07-29 21:38:13 +02:00
Marc Alexander
d4e623ffee
Merge branch '3.2.x' into 3.3.x
2019-07-29 21:31:12 +02:00
Marc Alexander
6078f58343
Merge pull request #5639 from marc1706/ticket/16112-3.3.x
...
[ticket/16112] Update composer dependencies for 3.3.x
2019-07-29 21:30:56 +02:00
Marc Alexander
6440f97a4f
Merge pull request #5638 from marc1706/ticket/16112
...
[ticket/16112] Update composer dependencies for 3.2.x
2019-07-29 21:30:53 +02:00
Marc Alexander
be3a58aff1
Merge branch '3.2.x' into 3.3.x
2019-07-29 20:48:28 +02:00
Marc Alexander
0ffd0d1924
Merge pull request #5627 from senky/ticket/16097
...
[ticket/16097] Add core.viewtopic_gen_sort_selects_before
2019-07-29 20:48:23 +02:00
Marc Alexander
eaf42f3c72
[ticket/16115] Add PHP 7.4snapshot to travis CI build matrix
...
PHPBB3-16115
2019-07-29 20:46:35 +02:00
Jakub Senko
cd6a0026d5
[ticket/16097] Correctly classify sort_days as int
...
PHPBB3-16097
2019-07-29 08:22:19 +02:00
Marc Alexander
189f3fd68e
Merge pull request #5636 from marc1706/ticket/15886
...
[ticket/15886] Use getMockBuilder instead of removed getMock()
2019-07-29 08:21:10 +02:00
Dark❶
221a91a26f
[ticket/16114] mcp_topic_postrow_post_details_author_username_{append/prepend}
...
PHPBB3-16114
2019-07-29 03:22:04 +05:30
Dark❶
cd75b712d4
[ticket/16113] Add core.mcp_topic_modify_sql_ary
...
PHPBB3-16113
2019-07-29 03:13:29 +05:30
Dark❶
b30822ea80
[ticket/16114] mcp_topic_postrow_post_details_author_username_{append/prepend}
...
PHPBB3-16114
2019-07-29 02:57:24 +05:30
EA117
81fd854983
[ticket/16040] Forum list won't display topic icons containing a space.
...
Change proSilver's viewforum_body.html template to be in line with existing
viewtopic_body.html behavior, in which the topic icon path will be surrounded
in quotes, and presence of a space in the topic icon file name will not fail.
PHPBB3-16040
2019-07-28 16:21:10 -05:00
Marc Alexander
7543508570
Merge branch 'ticket/16112' into ticket/16112-3.3.x
2019-07-28 23:11:52 +02:00
Marc Alexander
4084939620
[ticket/16112] Update composer dependencies for 3.2.x
...
PHPBB3-16112
2019-07-28 22:33:47 +02:00
Marc Alexander
e1962acd4e
[ticket/15886] Use getMockBuilder instead of removed getMock()
...
PHPBB3-15886
2019-07-28 21:53:04 +02:00
EA117
636fc7fad7
[ticket/16066] Fix FORM_INVALID always returned for banned user.
...
After the introduction of add_form_key() and check_form_key() calls to
login_box() in phpBB 3.2.6 and later, if a banned user attempts to login,
they receive a "The submitted form was invalid. Try submitting again."
Instead of the message indicating that they are banned, and why.
This is happening because check_ban() actually calls into login_box()
recursively, but after the $user->session_id has been switched to a new
session ID for the logging-on user. Therefore, now that check_form_key()
has been introduced to login_box(), it is impossible for check_form_key()
to succeed during this recursive call.
Fix is to make login_box()'s use of check_form_key() conditional on whether
IN_CHECK_BAN is defined, so that the recursive call does not attempt to
re-validate the form_key again. Note the form_key has already been
successfully verified by the original call into login_box(), prior to calling
into check_ban() and attempting to recursively call login_box(). So the
protection of why check_form_key() was added is still intact with this change.
PHPBB3-16066
2019-07-28 12:25:54 -05:00
Marc Alexander
710a0b3ea3
Merge branch '3.2.x' into 3.3.x
2019-07-28 17:55:30 +02:00
Marc Alexander
b53f95e577
Merge pull request #5494 from mrgoldy/ticket/15885
...
[ticket/15885] Display group rank on memberlist_body
2019-07-28 17:55:25 +02:00
Marc Alexander
2df9230902
Merge branch '3.2.x' into 3.3.x
2019-07-28 17:18:40 +02:00
Marc Alexander
f567b2bb69
Merge pull request #5459 from mrgoldy/ticket/15886
...
[ticket/15886] Group helper functions
2019-07-28 15:31:09 +02:00
Dark❶
8ac4f955ca
[ticket/16111] Add core.message_history_modify_sql_ary
...
PHPBB3-16111
2019-07-28 18:36:37 +05:30
Dark❶
01d0457f67
[ticket/16111] Add core.message_history_modify_sql_ary
...
PHPBB3-16111
2019-07-28 18:06:16 +05:30
