aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-311-1/+1
|\
| * Merge pull request #5641 from EA117/ticket/16040Marc Alexander2019-07-311-1/+1
| |\ | | | | | | | | | [ticket/16040] Forum list won't display topic icons containing a space.
| | * [ticket/16040] Forum list won't display topic icons containing a space.EA1172019-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch '3.2.x' into 3.3.xDerky2019-07-302-2/+4
|\ \ \ | |/ /
| * | Merge pull request #5628 from marc1706/ticket/16101Derky2019-07-302-2/+4
| |\ \ | | | | | | | | | | | | [ticket/16101] Add Referrer-Policy header to phpBB's headers
| | * | [ticket/16101] Add Referrer-Policy header to phpBB's headersMarc Alexander2019-07-202-2/+4
| | | | | | | | | | | | | | | | PHPBB3-16101
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-294-0/+24
|\ \ \ \ | |/ / /
| * | | Merge pull request #5633 from kasimi/ticket/16108Marc Alexander2019-07-294-0/+24
| |\ \ \ | | | | | | | | | | | | | | | [ticket/16108] Add topiclist_row_topic_by_author_before|after
| | * | | [ticket/16108] Use twig syntax in template eventMarc Alexander2019-07-273-6/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-16108
| | * | | [ticket/16108] Add topiclist_row_topic_by_author_before|afterkasimi2019-07-234-0/+24
| | |/ / | | | | | | | | | | | | PHPBB3-16108
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-292-0/+16
|\ \ \ \ | |/ / /
| * | | Merge pull request #5632 from kasimi/ticket/16107Marc Alexander2019-07-292-0/+16
| |\ \ \ | | | | | | | | | | | | | | | [ticket/16107] Add mcp_move_destination_forum_before|after
| | * | | [ticket/16107] Use twig syntax for eventMarc Alexander2019-07-271-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-16107
| | * | | [ticket/16107] Add mcp_move_destination_forum_before|afterkasimi2019-07-232-0/+16
| | |/ / | | | | | | | | | | | | PHPBB3-16107
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-291-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #5635 from EA117/ticket/16066Marc Alexander2019-07-291-1/+1
| |\ \ \ | | | | | | | | | | | | | | | [ticket/16066] Fix FORM_INVALID always returned for banned user.
| | * | | [ticket/16066] Fix FORM_INVALID always returned for banned user.EA1172019-07-281-1/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Merge pull request #5638 from marc1706/ticket/16112Marc Alexander2019-07-292-55/+56
| |\ \ \ | | | | | | | | | | | | | | | [ticket/16112] Update composer dependencies for 3.2.x
* | \ \ \ Merge pull request #5639 from marc1706/ticket/16112-3.3.xMarc Alexander2019-07-292-166/+171
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/16112] Update composer dependencies for 3.3.x
| * \ \ \ \ Merge branch 'ticket/16112' into ticket/16112-3.3.xMarc Alexander2019-07-282-166/+171
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | [ticket/16112] Update composer dependencies for 3.2.xMarc Alexander2019-07-282-55/+56
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16112
* | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-291-0/+32
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Merge pull request #5627 from senky/ticket/16097Marc Alexander2019-07-291-0/+32
| |\ \ \ \ | | |/ / / | |/| | | | | | | | [ticket/16097] Add core.viewtopic_gen_sort_selects_before
| | * | | [ticket/16097] Correctly classify sort_days as intJakub Senko2019-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-16097
| | * | | [ticket/16097] Add core.viewtopic_gen_sort_selects_beforeJakub Senko2019-07-081-0/+32
| | | |/ | | |/| | | | | | | | | PHPBB3-16097
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-281-7/+7
|\ \ \ \ | |/ / /
| * | | Merge pull request #5494 from mrgoldy/ticket/15885Marc Alexander2019-07-281-7/+7
| |\ \ \ | | | | | | | | | | | | | | | [ticket/15885] Display group rank on memberlist_body
| | * | | [ticket/15885] Display group rank on memberlist_bodymrgoldy2019-01-021-7/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-15885
* | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-284-5/+268
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #5459 from mrgoldy/ticket/15886Marc Alexander2019-07-284-5/+268
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | [ticket/15886] Group helper functions
| | * | | [ticket/15886] Fix minor code style issuesMarc Alexander2019-07-281-9/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
| | * | | [ticket/15886] Appropriate HTML docsmrgoldy2019-03-102-2/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
| | * | | [ticket/15886] Add @html doc for group/user stringsmrgoldy2019-03-092-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
| | * | | [ticket/15886] Move append_sid from constructormrgoldy2019-01-071-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
| | * | | [ticket/15886] No profile url for BOTS groupmrgoldy2019-01-021-3/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
| | * | | [ticket/15886] Change phpbb_get_group_avatar variable namesmrgoldy2018-12-301-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
| | * | | [ticket/15886] Clean up servicesmrgoldy2018-12-292-28/+20
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
| | * | | [ticket/15886] Class variable, comment splitting, events since tag, class namesmrgoldy2018-12-291-35/+52
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
| | * | | [ticket/15886] Group helper functionsmrgoldy2018-11-291-23/+21
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
| | * | | [ticket/15886] Enhance group helpermrgoldy2018-11-292-2/+247
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
* | | | | Merge pull request #5557 from senky/ticket/15088Marc Alexander2019-07-281-96/+54
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/15088] Avoid code repetitions in extension manager
| * | | | | [ticket/15088] Avoid code repetitions in extension managerJakub Senko2019-07-271-96/+54
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15088
* | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-282-21/+25
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge pull request #5575 from rubencm/ticket/14459Marc Alexander2019-07-282-21/+25
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14459] Check language input for group and fix template logic
| | * | | | [ticket/14459] Use language propertyrubencm2019-07-271-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
| | * | | | [ticket/14459] Rename variablerubencm2019-07-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
| | * | | | [ticket/14459] Fixrubencm2019-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
| | * | | | [ticket/14459] Uppercase string to try to match language keysrubencm2019-06-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
| | * | | | [ticket/14459] Uppercase string to try to match language keysrubencm2019-06-251-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
| | * | | | [ticket/14459] Remove unused coderubencm2019-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459