2.0.4

J 4 : setTemplate expects an object
conseilgouz · Sep 8, 2022 · 2c57b6e · 2c57b6e
1 parent 23c6b7d
commit 2c57b6e
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 13 deletions.
diff --git a/cg_template_switcher_changelog.xml b/cg_template_switcher_changelog.xml
@@ -1,5 +1,16 @@
 <changelogs>
 	<changelog>
+		<element>pkg_cg_template_switcher</element>
+		<type>package</type>
+		<version>2.0.4</version>
+        <note>
+            <item>Update : 08/09/2022</item>
+        </note>
+        <fix>
+            <item>SetTemplate expects an object</item>
+        </fix>
+	</changelog>
+		<changelog>
 		<element>pkg_cg_template_switcher</element>
 		<type>package</type>
 		<version>2.0.3</version>

diff --git a/packages/plg_system_cgstyle_j4.zip b/packages/plg_system_cgstyle_j4.zip
diff --git a/packages/plg_system_cgstyle_j4/cgstyle.php b/packages/plg_system_cgstyle_j4/cgstyle.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * @package CG template switcher Module
- * @version 2.0.0
+ * @version 2.0.4
  * @subpackage  system.cg_style
  *
- * @copyright   Copyright (C) 2021 Conseilgouz. All rights reserved.
+ * @copyright   Copyright (C) 2022 Conseilgouz. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  *
  */
@@ -23,14 +23,14 @@ public function onAfterRoute() {
 		if ($cookieValue) {
 			$db = Factory::getDbo();
 			$query = $db->getQuery(true);
-			$query->select('template, params');
+			$query->select('*');
 			$query->from('#__template_styles');
 			$query->where('client_id = 0');
 			$query->where('id = ' . (int)$cookieValue);
 			$db->setQuery($query);
 			$style = $db->loadObject();
 			if ($style != null) {
-				$app->setTemplate( $style->template, $style->params );
+				$app->setTemplate( $style); // 4.0 : expect an object
 			}
 		}
     }

diff --git a/packages/plg_system_cgstyle_j4/cgstyle.xml b/packages/plg_system_cgstyle_j4/cgstyle.xml
@@ -2,12 +2,12 @@
 <extension version="4.0" type="plugin" group="system" method="upgrade">
 	<name>plg_system_cgstyle</name>
 	<author>ConseilGouz</author>
-	<creationDate>September 2021</creationDate>
-	<copyright>(C)2021 ConseilGouz. All rights reserved.</copyright>
+	<creationDate>September 2022</creationDate>
+	<copyright>(C)2022 ConseilGouz. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.conseilgouz.com</authorUrl>
-	<version>2.0.0</version>
+	<version>2.0.4</version>
 	<description>PLG_SYSTEM_CGSTYLE_XML_DESCRIPTION</description>
 	<files>
 		<filename plugin="cgstyle">cgstyle.php</filename>

diff --git a/packages/plg_system_cgstyle_j4/language/en-GB/plg_system_cgstyle.ini b/packages/plg_system_cgstyle_j4/language/en-GB/plg_system_cgstyle.ini
@@ -1,2 +1,2 @@
-PLG_SYSTEM_CGSTYLE_XML_DESCRIPTION="Systeme - Template Style Switcher version 2.0.0."
+PLG_SYSTEM_CGSTYLE_XML_DESCRIPTION="Systeme - Template Style Switcher version 2.0.4."
 PLG_SYSTEM_CGSTYLE="Systeme - Template Style Switcher"
diff --git a/packages/plg_system_cgstyle_j4/language/en-GB/plg_system_cgstyle.sys.ini b/packages/plg_system_cgstyle_j4/language/en-GB/plg_system_cgstyle.sys.ini
@@ -1,3 +1,3 @@
-PLG_SYSTEM_CGSTYLE_XML_DESCRIPTION="Systeme - Template Style Switcher version 2.0.0."
+PLG_SYSTEM_CGSTYLE_XML_DESCRIPTION="Systeme - Template Style Switcher version 2.0.4."
 PLG_SYSTEM_CGSTYLE="System - Template Style Switcher"
 
diff --git a/packages/plg_system_cgstyle_j4/language/fr-FR/plg_system_cgstyle.ini b/packages/plg_system_cgstyle_j4/language/fr-FR/plg_system_cgstyle.ini
@@ -1,2 +1,2 @@
-PLG_SYSTEM_CGSTYLE_XML_DESCRIPTION="Systeme - Template Style Switcher version 2.0.0."
+PLG_SYSTEM_CGSTYLE_XML_DESCRIPTION="Systeme - Template Style Switcher version 2.0.4."
 PLG_SYSTEM_CGSTYLE="Systeme - Template Style Switcher"
diff --git a/packages/plg_system_cgstyle_j4/language/fr-FR/plg_system_cgstyle.sys.ini b/packages/plg_system_cgstyle_j4/language/fr-FR/plg_system_cgstyle.sys.ini
@@ -1,2 +1,2 @@
-PLG_SYSTEM_CGSTYLE_XML_DESCRIPTION="Systeme - Template Style Switcher version 2.0.0."
+PLG_SYSTEM_CGSTYLE_XML_DESCRIPTION="Systeme - Template Style Switcher version 2.0.4."
 PLG_SYSTEM_CGSTYLE="Systeme - Template Style Switcher"
diff --git a/pkg_cgtemplateswitcher.xml b/pkg_cgtemplateswitcher.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <extension type="package" version="3.10" method="upgrade">
  <name>CG Template Switcher</name>
- <creationDate>August 2022</creationDate>
+ <creationDate>September 2022</creationDate>
  <packagename>cgtemplateswitcher</packagename>
  <license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
  <author>ConseilGouz</author>
  <authorEmail>[email protected]</authorEmail>
  <authorUrl>www.conseilgouz.com</authorUrl>
- <version>2.0.3</version>
+ <version>2.0.4</version>
  <url>https://www.conseilgouz.com/</url>
  <packager>ConseilGouz</packager>
  <description>Package CG Template Switcher</description>