Merge branch '4.0-dev' into untranslated-String

joomla · Mar 14, 2019 · 4b624f8 · 4b624f8
2 parents e261db4 + 62d0714
commit 4b624f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/plugins/extension/finder/finder.php b/plugins/extension/finder/finder.php
@@ -72,13 +72,12 @@ public function onExtensionAfterUpdate($installer, $eid)
 	 *
 	 * @since   4.0.0
 	 */
-	public function onExtensionBeforeUninstall($installer, $eid, $removed)
+	public function onExtensionAfterUninstall($installer, $eid, $removed)
 	{
-		$extension = $this->getLanguage($eid);
-
-		if ($extension)
+		// Check that the language was successfully uninstalled.
+		if ($eid && $removed && $installer->extension->type === 'language')
 		{
-			$this->removeCommonWords($extension);
+			$this->removeCommonWords($installer->extension);
 		}
 	}
 

diff --git a/...Libraries/Cms/Mircodata/MicrodataTest.php → ...Libraries/Cms/Microdata/MicrodataTest.php b/...Libraries/Cms/Mircodata/MicrodataTest.php → ...Libraries/Cms/Microdata/MicrodataTest.php