JInstaller improvements/adjustments

libraries/joomla/installer/adapters/language.php

@@ -183,7 +183,7 @@ protected function _install($cname, $basePath, $clientId, &$element)
 			// Update function available or
 			// Update tag detected
 			if ($this->parent->isUpgrade() || ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update'))
-				|| is_a($updateElement, 'JXMLElement'))
+				|| $updateElement)
 			{
 				return $this->update(); // transfer control to the update function
 			}

libraries/joomla/installer/adapters/module.php

@@ -243,7 +243,7 @@ public function install()
 			// Update function available or
 			// Update tag detected
 			if ($this->parent->isUpgrade() || ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update'))
-				|| is_a($updateElement, 'JXMLElement'))
+				|| $updateElement)
 			{
 				// Force this one
 				$this->parent->setOverwrite(true);

libraries/joomla/installer/adapters/package.php

@@ -179,7 +179,8 @@ public function install()
 					$package = JInstallerHelper::unpack($file);
 				}
 				$tmpInstaller = new JInstaller;
-				if (!$tmpInstaller->install($package['dir']))
+				$installResult = $tmpInstaller->install($package['dir']);
+				if (!$installResult)
 				{
 					$this->parent->abort(
 						JText::sprintf(
@@ -193,7 +194,7 @@ public function install()
 				{
 					$results[$i] = array(
 						'name' => $tmpInstaller->manifest->name,
-						'result' => $tmpInstaller->install($package['dir'])
+						'result' => $installResult
 					);
 				}
 				$i++;

libraries/joomla/installer/adapters/plugin.php

@@ -210,7 +210,7 @@ public function install()
 			// Update function available or
 			// Update tag detected
 			if ($this->parent->isUpgrade() || ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update'))
-				|| is_a($updateElement, 'JXMLElement'))
+				|| $updateElement)
 			{
 				// Force this one
 				$this->parent->setOverwrite(true);

libraries/joomla/installer/adapters/template.php

@@ -78,6 +78,9 @@ public function loadLanguage($path = null)
 	 */
 	public function install()
 	{
+		// Get a database connector object
+		$db = $this->parent->getDbo();
+
 		$lang = JFactory::getLanguage();
 		$xml = $this->parent->getManifest();
 
@@ -109,13 +112,32 @@ public function install()
 		$this->set('name', $name);
 		$this->set('element', $element);
 
-		$db = $this->parent->getDbo();
+		// Check to see if a template by the same name is already installed.
 		$query = $db->getQuery(true);
-		$query->select($db->quoteName('extension_id'));
-		$query->from($db->quoteName('#__extensions'));
-		$query->where($db->quoteName('type') . ' = ' . $db->quote('template'));
-		$query->where($db->quoteName('element') . ' = ' . $element);
-		$id = $db->loadResult();
+		$query->select($query->qn('extension_id'))->from($query->qn('#__extensions'));
+		$query->where($query->qn('type') . ' = ' . $query->q('template'));
+		$query->where($query->qn('element') . ' = ' . $query->q($element));
+		$db->setQuery($query);
+
+		try
+		{
+			$id = $db->loadResult();
+		}
+		catch (JDatabaseException $e)
+		{
+			// Install failed, roll back changes
+			$this->parent->abort(JText::sprintf('JLIB_INSTALLER_ABORT_TPL_INSTALL_ROLLBACK'), $e->getMessage());
+			return false;
+		}
+
+		// Legacy error handling switch based on the JError::$legacy switch.
+		// @deprecated  12.1
+		if (JError::$legacy && $db->getErrorNum())
+		{
+			// Install failed, roll back changes
+			$this->parent->abort(JText::sprintf('JLIB_INSTALLER_ABORT_TPL_INSTALL_ROLLBACK', $db->stderr(true)));
+			return false;
+		}
 
 		// Set the template root path
 		$this->parent->setPath('extension_root', $basePath . '/templates/' . $element);
@@ -128,7 +150,7 @@ public function install()
 			// Update function available or
 			// Update tag detected
 			if ($this->parent->isUpgrade() || ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update'))
-				|| is_a($updateElement, 'JXMLElement'))
+				|| $updateElement)
 			{
 				// Force this one
 				$this->parent->setOverwrite(true);
@@ -146,7 +168,7 @@ public function install()
 				$this->parent
 					->abort(
 					JText::sprintf(
-						'JLIB_INSTALLER_ABORT_PLG_INSTALL_DIRECTORY', JText::_('JLIB_INSTALLER_' . $this->route),
+						'JLIB_INSTALLER_ABORT_TPL_INSTALL_ANOTHER_TEMPLATE_USING_DIRECTORY', JText::_('JLIB_INSTALLER_' . $this->route),
 						$this->parent->getPath('extension_root')
 					)
 				);