correct/add quotename (joomla#12070)

Bakual · Sep 20, 2016 · 942db14 · 942db14
1 parent eb5cd28
commit 942db14
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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);