[#29999] Fix fatal error in JInstallerFile::uninstall(). Thanks Matias

Griese.
joomla · Jan 29, 2013 · 7b59878 · 7b59878
1 parent fda2f19
commit 7b59878
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/installation/CHANGELOG b/installation/CHANGELOG
@@ -26,6 +26,9 @@ $ -> Language fix or change
 - -> Removed
 ! -> Note
 
+28-Jan-2013 Mark Dexter
+ # [#29999] Fix fatal error in JInstallerFile::uninstall(). Thanks Matias Griese.
+
 26-Jan-2013 Jean-Marie Simonet
 # [#30031] *Notice: Undefined index: title in /plugins/content/pagebreak/pagebreak.php on line 197. Thanks Bernard
 

diff --git a/libraries/joomla/installer/adapters/file.php b/libraries/joomla/installer/adapters/file.php
@@ -481,15 +481,15 @@ public function uninstall($id)
 			// Second argument is the utf compatible version attribute
 			$utfresult = $this->parent->parseSQLFiles($this->manifest->uninstall->sql);
 
+			$db = JFactory::getDbo();
 			if ($utfresult === false)
 			{
 				// Install failed, rollback changes
 				JError::raiseWarning(100, JText::sprintf('JLIB_INSTALLER_ERROR_FILE_UNINSTALL_SQL_ERROR', $db->stderr(true)));
 				$retval = false;
 			}
 
-			// Remove the schema version
-			$db = JFactory::getDbo();
+ 			// Remove the schema version
 			$query = $db->getQuery(true);
 			$query->delete()
 				->from('#__schemas')