diff options
author | Matt Friedman <maf675@gmail.com> | 2016-02-29 21:04:41 -0800 |
---|---|---|
committer | Matt Friedman <maf675@gmail.com> | 2016-02-29 21:04:41 -0800 |
commit | 07b8c0663d17bc891dcb19b7394a24a108316d36 (patch) | |
tree | b269299062d7cdc21915f34cc36479aa5df63ea4 /phpBB/phpbb/console/command/user/add.php | |
parent | b17f9fc81c40a6b7a5a45cc53e378274e1b6922b (diff) | |
download | forums-07b8c0663d17bc891dcb19b7394a24a108316d36.tar forums-07b8c0663d17bc891dcb19b7394a24a108316d36.tar.gz forums-07b8c0663d17bc891dcb19b7394a24a108316d36.tar.bz2 forums-07b8c0663d17bc891dcb19b7394a24a108316d36.tar.xz forums-07b8c0663d17bc891dcb19b7394a24a108316d36.zip |
[ticket/12684] Additional clean up
PHPBB3-12684
Diffstat (limited to 'phpBB/phpbb/console/command/user/add.php')
-rw-r--r-- | phpBB/phpbb/console/command/user/add.php | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/phpBB/phpbb/console/command/user/add.php b/phpBB/phpbb/console/command/user/add.php index 6f0988db5e..3e4fbe994f 100644 --- a/phpBB/phpbb/console/command/user/add.php +++ b/phpBB/phpbb/console/command/user/add.php @@ -184,11 +184,6 @@ class add extends \phpbb\console\command\command '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); 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->anti_abuse_headers($this->config, $this->user); $messenger->assign_vars(array( - 'WELCOME_MSG' => htmlspecialchars_decode($this->language->lang('WELCOME_SUBJECT', $this->config['sitename'])), - 'USERNAME' => htmlspecialchars_decode($data['username']), - 'PASSWORD' => htmlspecialchars_decode($data['new_password']), - 'U_ACTIVATE' => generate_board_url() . "/ucp.{$this->php_ext}?mode=activate&u=$user_id&k=$user_actkey") + 'WELCOME_MSG' => htmlspecialchars_decode($this->language->lang('WELCOME_SUBJECT', $this->config['sitename'])), + 'USERNAME' => htmlspecialchars_decode($data['username']), + 'PASSWORD' => htmlspecialchars_decode($data['new_password']), + 'U_ACTIVATE' => generate_board_url() . "/ucp.{$this->php_ext}?mode=activate&u=$user_id&k=$user_actkey") ); $messenger->send(NOTIFY_EMAIL); |