1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 11:13:59 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander
2019-11-21 14:55:37 +01:00
18 changed files with 78 additions and 254 deletions

View File

@@ -121,7 +121,6 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case
'user_password' => '$2y$10$4RmpyVu2y8Yf/lP3.yQBquKvE54TCUuEDEBJYY6FDDFN3LcbCGz9i',
'user_passchg' => '0',
'user_email' => 'example@example.com',
'user_email_hash' => '0',
'user_birthday' => '',
'user_lastvisit' => '0',
'user_lastmark' => '0',

View File

@@ -30,14 +30,14 @@
<column>username_clean</column>
<column>user_permissions</column>
<column>user_sig</column>
<column>user_email_hash</column>
<column>user_email</column>
<row>
<value>1</value>
<value>admin</value>
<value>admin</value>
<value></value>
<value></value>
<value>143317126117</value>
<value>admin@example.com</value>
</row>
</table>
</dataset>