makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12684] Additional clean up

Browse source 
PHPBB3-12684
This commit is contained in:
Matt Friedman 2016-02-29 21:04:41 -08:00
parent b17f9fc81c
commit 07b8c0663d
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
phpBB/phpbb/console/command/user/add.php
View file

@ -184,11 +184,6 @@ class add extends \phpbb\console\command\command
'user_regdate' => time(), 'user_regdate' => time(),
); );
if (!function_exists('user_add'))
{
require($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
}
$user_id = (int) user_add($user_row); $user_id = (int) user_add($user_row);
if ($input->getOption('send-email') && $this->config['email_enable']) if ($input->getOption('send-email') && $this->config['email_enable'])
@ -294,10 +289,10 @@ class add extends \phpbb\console\command\command
$messenger->to($data['email'], $data['username']); $messenger->to($data['email'], $data['username']);
$messenger->anti_abuse_headers($this->config, $this->user); $messenger->anti_abuse_headers($this->config, $this->user);
$messenger->assign_vars(array( $messenger->assign_vars(array(
'WELCOME_MSG' => htmlspecialchars_decode($this->language->lang('WELCOME_SUBJECT', $this->config['sitename'])), 'WELCOME_MSG' => htmlspecialchars_decode($this->language->lang('WELCOME_SUBJECT', $this->config['sitename'])),
'USERNAME' => htmlspecialchars_decode($data['username']), 'USERNAME' => htmlspecialchars_decode($data['username']),
'PASSWORD' => htmlspecialchars_decode($data['new_password']), 'PASSWORD' => htmlspecialchars_decode($data['new_password']),
'U_ACTIVATE' => generate_board_url() . "/ucp.{$this->php_ext}?mode=activate&u=$user_id&k=$user_actkey") 'U_ACTIVATE' => generate_board_url() . "/ucp.{$this->php_ext}?mode=activate&u=$user_id&k=$user_actkey")
); );
$messenger->send(NOTIFY_EMAIL); $messenger->send(NOTIFY_EMAIL);