diff options
| author | Matt Friedman <maf675@gmail.com> | 2016-02-29 08:28:37 -0800 |
|---|---|---|
| committer | Matt Friedman <maf675@gmail.com> | 2016-02-29 08:28:37 -0800 |
| commit | d17a8ab523f5cc77352170c679767c5523f57ec9 (patch) | |
| tree | cc20c579afd6e754a67b14b65fbaeafcee3289ca | |
| parent | 8f7aba6582c3fb748ed67720292f1d236d4e1270 (diff) | |
| download | forums-d17a8ab523f5cc77352170c679767c5523f57ec9.tar forums-d17a8ab523f5cc77352170c679767c5523f57ec9.tar.gz forums-d17a8ab523f5cc77352170c679767c5523f57ec9.tar.bz2 forums-d17a8ab523f5cc77352170c679767c5523f57ec9.tar.xz forums-d17a8ab523f5cc77352170c679767c5523f57ec9.zip | |
[ticket/12684] Fix merge errors
PHPBB3-12684
| -rw-r--r-- | phpBB/config/default/container/services_console.yml | 10 | ||||
| -rw-r--r-- | phpBB/language/en/cli.php | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/phpBB/config/default/container/services_console.yml b/phpBB/config/default/container/services_console.yml index 2055fb68c5..b39353d841 100644 --- a/phpBB/config/default/container/services_console.yml +++ b/phpBB/config/default/container/services_console.yml @@ -175,6 +175,16 @@ services: tags: - { name: console.command } + console.command.user.add: + class: phpbb\console\command\user\add + arguments: + - '@user' + - '@dbal.conn' + - '@config' + - '@passwords.manager' + tags: + - { name: console.command } + console.command.reparser.list: class: phpbb\console\command\reparser\list_all arguments: diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php index 1c549e5f9f..9a082b0c57 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -82,6 +82,11 @@ $lang = array_merge($lang, array( 'CLI_DESCRIPTION_THUMBNAIL_GENERATE' => 'Generate all missing thumbnails.', 'CLI_DESCRIPTION_THUMBNAIL_RECREATE' => 'Recreate all thumbnails.', + 'CLI_DESCRIPTION_USER_ADD' => 'Add a new user', + 'CLI_DESCRIPTION_USER_ADD_OPTION_USERNAME' => 'Username of the new user', + 'CLI_DESCRIPTION_USER_ADD_OPTION_PASSWORD' => 'Password of the new user', + 'CLI_DESCRIPTION_USER_ADD_OPTION_EMAIL' => 'E-mail address of the new user', + 'CLI_EXTENSION_DISABLE_FAILURE' => 'Could not disable extension %s', 'CLI_EXTENSION_DISABLE_SUCCESS' => 'Successfully disabled extension %s', 'CLI_EXTENSION_ENABLE_FAILURE' => 'Could not enable extension %s', |