mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-29 21:10:31 +02:00
Code Issues Releases Wiki Activity

Merge pull request from rubencm/ticket/15714

Browse Source 
[ticket/15714] Auto login after registration

* github.com:/phpbb/phpbb:
  [ticket/15714] Edit language string
  [ticket/15714] Auto login after registration
This commit is contained in:
Tristan Darricau
2018-07-08 18:23:33 +02:00
parent 187e598236 48afa41669
commit 4028c92c9d
2 changed files with 4 additions and 1 deletions
phpBB
includes
ucp
ucp_register.php
language
en
ucp.php

3
phpBB/includes/ucp/ucp_register.php

@@ -451,6 +451,9 @@ class ucp_register
{ {
$message = $user->lang['ACCOUNT_ADDED']; $message = $user->lang['ACCOUNT_ADDED'];
$email_template = 'user_welcome'; $email_template = 'user_welcome';
// Autologin after registration
$user->session_create($user_id, 0, false, 1);
} }
if ($config['email_enable']) if ($config['email_enable'])

2
phpBB/language/en/ucp.php

@@ -62,7 +62,7 @@ $lang = array_merge($lang, array(
'ACCOUNT_ACTIVE' => 'Your account has now been activated. Thank you for registering.', 'ACCOUNT_ACTIVE' => 'Your account has now been activated. Thank you for registering.',
'ACCOUNT_ACTIVE_ADMIN' => 'The account has now been activated.', 'ACCOUNT_ACTIVE_ADMIN' => 'The account has now been activated.',
'ACCOUNT_ACTIVE_PROFILE' => 'Your account has now been successfully reactivated.', 'ACCOUNT_ACTIVE_PROFILE' => 'Your account has now been successfully reactivated.',
'ACCOUNT_ADDED' => 'Thank you for registering, your account has been created. You may now login with your username and password.', 'ACCOUNT_ADDED' => 'Thank you for registering, your account has been created.',
'ACCOUNT_COPPA' => 'Your account has been created but has to be approved, please check your email for details.', 'ACCOUNT_COPPA' => 'Your account has been created but has to be approved, please check your email for details.',
'ACCOUNT_EMAIL_CHANGED' => 'Your account has been updated. However, this board requires account reactivation on email changes. An activation key has been sent to the new email address you provided. Please check your email for further information.', 'ACCOUNT_EMAIL_CHANGED' => 'Your account has been updated. However, this board requires account reactivation on email changes. An activation key has been sent to the new email address you provided. Please check your email for further information.',
'ACCOUNT_EMAIL_CHANGED_ADMIN' => 'Your account has been updated. However, this board requires account reactivation by the administrators on email changes. An email has been sent to them and you will be informed when your account has been reactivated.', 'ACCOUNT_EMAIL_CHANGED_ADMIN' => 'Your account has been updated. However, this board requires account reactivation by the administrators on email changes. An email has been sent to them and you will be informed when your account has been reactivated.',