Merge branch '3.3.x'

2025-08-06 08:47:45 +02:00 · 2024-05-31 21:41:59 +02:00
parent 32e6c637ec 2976314205
commit b22726294d
18 changed files with 286 additions and 66 deletions
--- a/tests/auth/provider_apache_test.php
+++ b/tests/auth/provider_apache_test.php
@@ -167,6 +167,7 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case
 			'user_sig_bbcode_bitfield' => '',
 			'user_jabber' => '',
 			'user_actkey' => '',
+			'user_actkey_expiration' => 0,
 			'user_newpasswd' => '',
 			'user_form_salt' => '',
 			'user_new' => 1,