[ticket/15433] Fix phpbbcli can enable non-existent extension

Fix phpbbcli can enable non-existent extension PHPBB3-15433
Xylent · Dec 3, 2017 · 03b3b38 · 03b3b38
1 parent 131c264
commit 03b3b38
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php
@@ -117,6 +117,7 @@
 	'CLI_EXTENSION_ENABLE_FAILURE'		=> 'Could not enable extension %s',
 	'CLI_EXTENSION_ENABLE_SUCCESS'		=> 'Successfully enabled extension %s',
 	'CLI_EXTENSION_ENABLED'				=> 'Extension %s is already enabled',
+	'CLI_EXTENSION_NOT_EXIST'			=> 'Extension %s does not exist',
 	'CLI_EXTENSION_NAME'				=> 'Name of the extension',
 	'CLI_EXTENSION_PURGE_FAILURE'		=> 'Could not purge extension %s',
 	'CLI_EXTENSION_PURGE_SUCCESS'		=> 'Successfully purged extension %s',

diff --git a/phpBB/phpbb/console/command/extension/enable.php b/phpBB/phpbb/console/command/extension/enable.php
@@ -37,6 +37,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
 		$io = new SymfonyStyle($input, $output);
 
 		$name = $input->getArgument('extension-name');
+
+		if (!$this->manager->is_available($name))
+		{
+			$io->error($this->user->lang('CLI_EXTENSION_NOT_EXIST', $name));
+			return 1;
+		}
+
 		$extension = $this->manager->get_extension($name);
 
 		if (!$extension->is_enableable())