4 files changed, 7 insertions, 4 deletions
diff --git a/phpBB/phpbb/console/command/cron/run.php b/phpBB/phpbb/console/command/cron/run.php
index dea6493007..df8bcf44f9 100644
--- a/phpBB/phpbb/console/command/cron/run.php
+++ b/phpBB/phpbb/console/command/cron/run.php
@@ -73,7 +73,7 @@ class run extends \phpbb\console\command\command
 	* @param InputInterface $input The input stream used to get the argument and verboe option.
 	* @param OutputInterface $output The output stream, used for printing verbose-mode and error information.
 	*
-	* @return int 0 if all is ok, 1 if a lock error occured and 2 if no task matching the argument was found.
+	* @return int 0 if all is ok, 1 if a lock error occurred and 2 if no task matching the argument was found.
 	*/
 	protected function execute(InputInterface $input, OutputInterface $output)
 	{
diff --git a/phpBB/phpbb/console/command/extension/enable.php b/phpBB/phpbb/console/command/extension/enable.php
index a6f5b10e86..f007009aa0 100644
--- a/phpBB/phpbb/console/command/extension/enable.php
+++ b/phpBB/phpbb/console/command/extension/enable.php
@@ -69,7 +69,10 @@ class enable extends command
 		}
 		else
 		{
-			$io->error($this->user->lang('CLI_EXTENSION_ENABLE_FAILURE', $name));
+			$enableable = $this->manager->get_extension($name)->is_enableable();
+			$message = !empty($enableable) ? $enableable : $this->user->lang('CLI_EXTENSION_ENABLE_FAILURE');
+			$message = is_array($message) ? implode(PHP_EOL, $message) : $message;
+			$io->error($message, $name);
 			return 1;
 		}
 	}
diff --git a/phpBB/phpbb/console/command/update/check.php b/phpBB/phpbb/console/command/update/check.php
index 9ced651e8b..85c6cf7379 100644
--- a/phpBB/phpbb/console/command/update/check.php
+++ b/phpBB/phpbb/console/command/update/check.php
@@ -77,7 +77,7 @@ class check extends \phpbb\console\command\command
 	*
 	* @param InputInterface $input Input stream, used to get the options.
 	* @param OutputInterface $output Output stream, used to print messages.
-	* @return int 0 if the board is up to date, 1 if it is not and 2 if an error occured.
+	* @return int 0 if the board is up to date, 1 if it is not and 2 if an error occurred.
 	* @throws \RuntimeException
 	*/
 	protected function execute(InputInterface $input, OutputInterface $output)
diff --git a/phpBB/phpbb/console/command/user/add.php b/phpBB/phpbb/console/command/user/add.php
index c60a059251..303216a93d 100644
--- a/phpBB/phpbb/console/command/user/add.php
+++ b/phpBB/phpbb/console/command/user/add.php
@@ -239,7 +239,7 @@ class add extends command
 				array('string', false, $this->config['min_name_chars'], $this->config['max_name_chars']),
 				array('username', '')),
 			'new_password' => array(
-				array('string', false, $this->config['min_pass_chars'], $this->config['max_pass_chars']),
+				array('string', false, $this->config['min_pass_chars'], 0),
 				array('password')),
 			'email'        => array(
 				array('string', false, 6, 60),