Merge pull request joomla#723 from mbabker/library

Fix queries for multi-db in JInstallerLibrary
raditzfarhan · Jan 8, 2012 · dcbb3ed · dcbb3ed
2 parents 4969a5b + de20c25
commit dcbb3ed
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/libraries/joomla/installer/adapters/library.php b/libraries/joomla/installer/adapters/library.php
@@ -69,7 +69,12 @@ public function install()
 		$this->set('element', $element);
 
 		$db = $this->parent->getDbo();
-		$db->setQuery('SELECT extension_id FROM #__extensions WHERE type="library" AND element = "' . $element . '"');
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName('extension_id'));
+		$query->from($db->quoteName('#__extensions'));
+		$query->where($db->quoteName('type') . ' = ' . $db->quote('library'));
+		$query->where($db->quoteName('element') . ' = ' . $db->quote($element));
+		$db->setQuery($query);
 		$result = $db->loadResult();
 		if ($result)
 		{
@@ -205,7 +210,12 @@ public function update()
 		$this->set('element', $element);
 		$installer = new JInstaller; // we don't want to compromise this instance!
 		$db = $this->parent->getDbo();
-		$db->setQuery('SELECT extension_id FROM #__extensions WHERE type="library" AND element = "' . $element . '"');
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName('extension_id'));
+		$query->from($db->quoteName('#__extensions'));
+		$query->where($db->quoteName('type') . ' = ' . $db->quote('library'));
+		$query->where($db->quoteName('element') . ' = ' . $db->quote($element));
+		$db->setQuery($query);
 		$result = $db->loadResult();
 		if ($result)
 		{