From 1c7ec5e1568a1d01febddc22569e80987f70d526 Mon Sep 17 00:00:00 2001
From: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date: Mon, 19 Sep 2016 12:28:52 +0100
Subject: [PATCH] correct/add quotename (#12070)

---
 libraries/cms/component/helper.php | 12 ++++++------
 libraries/cms/library/helper.php   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/cms/component/helper.php b/libraries/cms/component/helper.php
index 80432fdd9ad29..0274405e9e34a 100644
--- a/libraries/cms/component/helper.php
+++ b/libraries/cms/component/helper.php
@@ -97,10 +97,10 @@ public static function isInstalled($option)
 
 		return (int) $db->setQuery(
 			$db->getQuery(true)
-				->select('COUNT(extension_id)')
-				->from('#__extensions')
-				->where('element = ' . $db->quote($option))
-				->where('type = ' . $db->quote('component'))
+				->select('COUNT(' . $db->quoteName('extension_id') . ')')
+				->from($db->quoteName('#__extensions'))
+				->where($db->quoteName('element') . ' = ' . $db->quote($option))
+				->where($db->quoteName('type') . ' = ' . $db->quote('component'))
 		)->loadResult();
 	}
 
@@ -436,8 +436,8 @@ protected static function load($option)
 	{
 		$db = JFactory::getDbo();
 		$query = $db->getQuery(true)
-			->select('extension_id AS id, element AS "option", params, enabled')
-			->from('#__extensions')
+			->select($db->quoteName(array('extension_id', 'element', 'params', 'enabled'), array('id', 'option', null, null)))
+			->from($db->quoteName('#__extensions'))
 			->where($db->quoteName('type') . ' = ' . $db->quote('component'));
 		$db->setQuery($query);
 
diff --git a/libraries/cms/library/helper.php b/libraries/cms/library/helper.php
index dd79830d376f0..65fb44582223f 100644
--- a/libraries/cms/library/helper.php
+++ b/libraries/cms/library/helper.php
@@ -143,8 +143,8 @@ protected static function _load($element)
 	{
 		$db = JFactory::getDbo();
 		$query = $db->getQuery(true)
-			->select('extension_id AS id, element AS "option", params, enabled')
-			->from('#__extensions')
+			->select($db->quoteName(array('extension_id', 'element', 'params', 'enabled'), array('id', 'option', null, null)))
+			->from($db->quoteName('#__extensions'))
 			->where($db->quoteName('type') . ' = ' . $db->quote('library'))
 			->where($db->quoteName('element') . ' = ' . $db->quote($element));
 		$db->setQuery($query);