Code commits
phpBB Master
-
Marc 1d942d4b178ac4465420d39423ecdeabe6b62372
Merge branch '3.3.x'
-
Marc 90722a3c662e643b185d143484b95a1af959bad5 m
Merge branch '3.2.x' into 3.3.x
-
Marc a02524e7fcf26f380889d541255f4738e3eabe76 m
Merge pull request #5633 from kasimi/ticket/16108
[ticket/16108] Add topiclist_row_topic_by_author_before|after -
Marc e9dbba649afb16ff97f0596abe622be92d82f4c3
Merge branch '3.3.x'
-
Marc 2e634e9f96b460150344c96df48970cce6783f63 m
Merge branch '3.2.x' into 3.3.x
-
Marc 207b678896d8d46f8e5b5cca05beffcbd89e11d3 m
Merge pull request #5632 from kasimi/ticket/16107
[ticket/16107] Add mcp_move_destination_forum_before|after -
Marc 7eedb85b0b3525896269e713ba12470c0521260a
Merge branch '3.3.x'
-
Marc e086d4039e0811aa8eac92ac83f2ca94d494f85b m
Merge branch '3.2.x' into 3.3.x
-
Marc 51205febe37e0df26eafa966ddcf32015ef62d6e m
Merge pull request #5635 from EA117/ticket/16066
[ticket/16066] Fix FORM_INVALID always returned for banned user. -
EA117 636fc7fad7dcb61622f23b36141b87ee13a1090d m
[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- phpBB/includes/functions.php (version 636fc7fad7dcb61622f23b36141b87ee13a1090d)
-
Marc 179f5c75edcdec0c3857b7f9520eb24413b0bc56 m
[ticket/16108] Use twig syntax in template event
PHPBB3-16108- phpBB/styles/prosilver/template/mcp_forum.html (version 179f5c75edcdec0c3857b7f9520eb24413b0bc56)
- phpBB/styles/prosilver/template/search_results.html (version 179f5c75edcdec0c3857b7f9520eb24413b0bc56)
- phpBB/styles/prosilver/template/viewforum_body.html (version 179f5c75edcdec0c3857b7f9520eb24413b0bc56)
-
Marc 1a00b4a5658fa98fa86f9c596387c23dcc63408d m
[ticket/16107] Use twig syntax for event
PHPBB3-16107- phpBB/styles/prosilver/template/mcp_move.html (version 1a00b4a5658fa98fa86f9c596387c23dcc63408d)
-
kasimi <mail@kasimi.net> 7a5470161243b300b5377c22876126ecf3de8f6c m
[ticket/16108] Add topiclist_row_topic_by_author_before|after
PHPBB3-16108- phpBB/docs/events.md (version 7a5470161243b300b5377c22876126ecf3de8f6c)
- phpBB/styles/prosilver/template/mcp_forum.html (version 7a5470161243b300b5377c22876126ecf3de8f6c)
- phpBB/styles/prosilver/template/search_results.html (version 7a5470161243b300b5377c22876126ecf3de8f6c)
- phpBB/styles/prosilver/template/viewforum_body.html (version 7a5470161243b300b5377c22876126ecf3de8f6c)
-
kasimi <mail@kasimi.net> 2bb08f853ea6ed60987f9886cd72eaa74ebd6c44 m
[ticket/16107] Add mcp_move_destination_forum_before|after
PHPBB3-16107- phpBB/docs/events.md (version 2bb08f853ea6ed60987f9886cd72eaa74ebd6c44)
- phpBB/styles/prosilver/template/mcp_move.html (version 2bb08f853ea6ed60987f9886cd72eaa74ebd6c44)