4 files changed, 21 insertions, 16 deletions
diff --git a/phpBB/phpbb/console/command/extension/enable.php b/phpBB/phpbb/console/command/extension/enable.php
index a8312d5c15..a6f5b10e86 100644
--- a/phpBB/phpbb/console/command/extension/enable.php
+++ b/phpBB/phpbb/console/command/extension/enable.php
@@ -38,10 +38,24 @@ class enable extends command
 
 		$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())
+		{
+			$io->error($this->user->lang('CLI_EXTENSION_NOT_ENABLEABLE', $name));
+			return 1;
+		}
+
 		if ($this->manager->is_enabled($name))
 		{
 			$io->error($this->user->lang('CLI_EXTENSION_ENABLED', $name));
-			return 2;
+			return 1;
 		}
 
 		$this->manager->enable($name);
diff --git a/phpBB/phpbb/console/command/fixup/update_hashes.php b/phpBB/phpbb/console/command/fixup/update_hashes.php
index 4bcc3b5d19..9a0e9bc798 100644
--- a/phpBB/phpbb/console/command/fixup/update_hashes.php
+++ b/phpBB/phpbb/console/command/fixup/update_hashes.php
@@ -101,9 +101,9 @@ class update_hashes extends \phpbb\console\command\command
 		{
 			$new_hash = $this->passwords_manager->hash($row['user_password'], array($this->default_type));
 
-			$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_password = "' . $this->db->sql_escape($new_hash) . '"
-					WHERE user_id = ' . (int) $row['user_id'];
+			$sql = 'UPDATE ' . USERS_TABLE . "
+					SET user_password = '" . $this->db->sql_escape($new_hash) . "'
+					WHERE user_id = " . (int) $row['user_id'];
 			$this->db->sql_query($sql);
 			$progress_bar->advance();
 		}
diff --git a/phpBB/phpbb/console/command/thumbnail/delete.php b/phpBB/phpbb/console/command/thumbnail/delete.php
index cfa9891fbc..9f2ee822be 100644
--- a/phpBB/phpbb/console/command/thumbnail/delete.php
+++ b/phpBB/phpbb/console/command/thumbnail/delete.php
@@ -107,7 +107,7 @@ class delete extends \phpbb\console\command\command
 			{
 				$thumbnail_deleted[] = $row['attach_id'];
 
-				if (sizeof($thumbnail_deleted) === 250)
+				if (count($thumbnail_deleted) === 250)
 				{
 					$this->commit_changes($thumbnail_deleted);
 					$thumbnail_deleted = array();
diff --git a/phpBB/phpbb/console/exception_subscriber.php b/phpBB/phpbb/console/exception_subscriber.php
index b920d4abae..b240993203 100644
--- a/phpBB/phpbb/console/exception_subscriber.php
+++ b/phpBB/phpbb/console/exception_subscriber.php
@@ -29,12 +29,10 @@ class exception_subscriber implements EventSubscriberInterface
 	 * Construct method
 	 *
 	 * @param \phpbb\language\language $language Language object
-	 * @param bool $debug Debug mode
 	 */
-	public function __construct(\phpbb\language\language $language, $debug = false)
+	public function __construct(\phpbb\language\language $language)
 	{
 		$this->language = $language;
-		$this->debug = $debug;
 	}
 
 	/**
@@ -52,14 +50,7 @@ class exception_subscriber implements EventSubscriberInterface
 			$parameters = array_merge(array($original_exception->getMessage()), $original_exception->get_parameters());
 			$message = call_user_func_array(array($this->language, 'lang'), $parameters);
 
-			if ($this->debug)
-			{
-				$exception = new \RuntimeException($message , $original_exception->getCode(), $original_exception);
-			}
-			else
-			{
-				$exception = new \RuntimeException($message , $original_exception->getCode());
-			}
+			$exception = new \RuntimeException($message , $original_exception->getCode(), $original_exception);
 
 			$event->setException($exception);
 		}