From feb1c16baf18adc60a3f7881bb8982a8fe91c5d5 Mon Sep 17 00:00:00 2001 From: Sven Schultschik Date: Mon, 4 Oct 2021 02:07:14 +0200 Subject: [PATCH 1/3] fix Call to a member function getGroup() on null #97 --- .../components/com_schuweb_sitemap/schuweb_sitemap.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/administrator/components/com_schuweb_sitemap/schuweb_sitemap.xml b/administrator/components/com_schuweb_sitemap/schuweb_sitemap.xml index d52ea8e..e006a0b 100644 --- a/administrator/components/com_schuweb_sitemap/schuweb_sitemap.xml +++ b/administrator/components/com_schuweb_sitemap/schuweb_sitemap.xml @@ -53,13 +53,14 @@ controller.php index.html LICENSE.txt + controllers + forms + helpers images install - helpers - controllers + models tables views - models en-GB/en-GB.com_schuweb_sitemap.ini From 6cb66009a843b4eb1c314fcd42c3d8ba16a261ec Mon Sep 17 00:00:00 2001 From: Sven Schultschik Date: Mon, 4 Oct 2021 14:43:53 +0200 Subject: [PATCH 2/3] Fix false positiv error in instal.script if old plugins not installed --- install.script.php | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/install.script.php b/install.script.php index 7af203c..cea86cb 100644 --- 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); } } } From 1e4df8738fcd76af418a3dcfc7a4687b26c106a6 Mon Sep 17 00:00:00 2001 From: Sven Schultschik Date: Mon, 4 Oct 2021 14:56:02 +0200 Subject: [PATCH 3/3] update XML 3.4.1 --- update/schuweb_sitemap.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/update/schuweb_sitemap.xml b/update/schuweb_sitemap.xml index b4e17ae..b83ba2f 100644 --- a/update/schuweb_sitemap.xml +++ b/update/schuweb_sitemap.xml @@ -1,5 +1,23 @@ + + SchuWeb Sitemap + SchuWeb Sitemap - Sitemap Generator for Joomla! + com_schuweb_sitemap + component + 3.4.1 + https://extensions.schultschik.com/products/schuweb-sitemap/schuweb-sitemap-3-4-1 + + https://github.com/svanschu/SchuWeb-Sitemap/releases/download/3.4.1/pkg_schuweb_sitemap_3.4.1_20211004_J4.zip + + + stable + + Sven Schultschik + http://www.schultschik.de + + 7.2.5 + SchuWeb Sitemap SchuWeb Sitemap - Sitemap Generator for Joomla!