Merge branch 'hotfix/3.4.1'

svanschu · Oct 4, 2021 · 74c1b5a · 74c1b5a
2 parents e43e088 + 1e4df87
commit 74c1b5a
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 14 deletions.
diff --git a/administrator/components/com_schuweb_sitemap/schuweb_sitemap.xml b/administrator/components/com_schuweb_sitemap/schuweb_sitemap.xml
@@ -53,13 +53,14 @@
             <filename>controller.php</filename>
             <filename>index.html</filename>
             <filename>LICENSE.txt</filename>
+            <folder>controllers</folder>
+            <folder>forms</folder>
+            <folder>helpers</folder>
             <folder>images</folder>
             <folder>install</folder>
-            <folder>helpers</folder>
-            <folder>controllers</folder>
+            <folder>models</folder>
             <folder>tables</folder>
             <folder>views</folder>
-            <folder>models</folder>
         </files>
         <languages folder="admin/language">
             <language tag="en-GB">en-GB/en-GB.com_schuweb_sitemap.ini</language>

diff --git a/install.script.php b/install.script.php
@@ -175,20 +175,23 @@ private function upgradeJ3J4()
 				$db->setQuery($query);
 				$extension = $db->loadObject();
 
-				$manifest = json_decode($extension->manifest_cache);
-
-				if (!is_null($manifest))
+				if (!is_null($extension))
 				{
-					if (version_compare($manifest->version, '3.4.0', 'lt'))
+					$manifest = json_decode($extension->manifest_cache);
+
+					if (!is_null($manifest))
 					{
-						$installer = Installer::getInstance();
-						if (!$installer->uninstall('plugin', $extension->extension_id))
-							$errMessages[] = Text::sprintf('COM_SCHUWEB_SITEMAP_POSTFLIGHT_PLUGIN_UNINSTALL_ERR', $componentName);
+						if (version_compare($manifest->version, '3.4.0', 'lt'))
+						{
+							$installer = Installer::getInstance();
+							if (!$installer->uninstall('plugin', $extension->extension_id))
+								$errMessages[] = Text::sprintf('COM_SCHUWEB_SITEMAP_POSTFLIGHT_PLUGIN_UNINSTALL_ERR', $componentName);
+						}
+					}
+					else
+					{
+						$errMessages[] = Text::sprintf('COM_SCHUWEB_SITEMAP_POSTFLIGHT_PLUGIN_UNINSTALL_MANIFEST_ERR', $componentName);
 					}
-				}
-				else
-				{
-					$errMessages[] = Text::sprintf('COM_SCHUWEB_SITEMAP_POSTFLIGHT_PLUGIN_UNINSTALL_MANIFEST_ERR', $componentName);
 				}
 			}
 		}

diff --git a/update/schuweb_sitemap.xml b/update/schuweb_sitemap.xml
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <updates>
+    <update>
+        <name>SchuWeb Sitemap</name>
+        <description>SchuWeb Sitemap - Sitemap Generator for Joomla!</description>
+        <element>com_schuweb_sitemap</element>
+        <type>component</type>
+        <version>3.4.1</version>
+        <infourl title="SchuWeb Sitemap 3.4.1">https://extensions.schultschik.com/products/schuweb-sitemap/schuweb-sitemap-3-4-1</infourl>
+        <downloads>
+            <downloadurl type="full" format="zip">https://github.com/svanschu/SchuWeb-Sitemap/releases/download/3.4.1/pkg_schuweb_sitemap_3.4.1_20211004_J4.zip</downloadurl>
+        </downloads>
+        <tags>
+            <tag>stable</tag>
+        </tags>
+        <maintainer>Sven Schultschik</maintainer>
+        <maintainerurl>http://www.schultschik.de</maintainerurl>
+        <targetplatform name="joomla" version="4"/>
+        <php_minimum>7.2.5</php_minimum>
+    </update>
     <update>
         <name>SchuWeb Sitemap</name>
         <description>SchuWeb Sitemap - Sitemap Generator for Joomla!</description>