From a98385a804a34c3696941a38bf953214869fcdfb Mon Sep 17 00:00:00 2001
From: conseilgouz <pascal.leconte@conseilgouz.com>
Date: Sun, 22 May 2022 18:21:56 +0200
Subject: [PATCH 01/11] Links from numeric tags cause error 404

same fix than #37814
---
 components/com_tags/src/Model/TagModel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/com_tags/src/Model/TagModel.php b/components/com_tags/src/Model/TagModel.php
index 7a99186e536b3..ab07ae2998fe3 100644
--- a/components/com_tags/src/Model/TagModel.php
+++ b/components/com_tags/src/Model/TagModel.php
@@ -186,7 +186,7 @@ protected function populateState($ordering = 'c.core_title', $direction = 'ASC')
 		$this->setState('params', $params);
 
 		// Load state from the request.
-		$ids = (array) $app->input->get('id', array());
+		$ids = (array) $app->input->get('id', array(),'int');
 
 		if (count($ids) == 1)
 		{

From 7c1be5b97c4f9143655f43a381432427d3256c64 Mon Sep 17 00:00:00 2001
From: conseilgouz <pascal.leconte@conseilgouz.com>
Date: Sun, 22 May 2022 18:23:50 +0200
Subject: [PATCH 02/11] Update TagModel.php

---
 components/com_tags/src/Model/TagModel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/com_tags/src/Model/TagModel.php b/components/com_tags/src/Model/TagModel.php
index ab07ae2998fe3..4458a02be93f4 100644
--- a/components/com_tags/src/Model/TagModel.php
+++ b/components/com_tags/src/Model/TagModel.php
@@ -186,7 +186,7 @@ protected function populateState($ordering = 'c.core_title', $direction = 'ASC')
 		$this->setState('params', $params);
 
 		// Load state from the request.
-		$ids = (array) $app->input->get('id', array(),'int');
+		$ids = (array) $app->input->get('id', array(), 'int');
 
 		if (count($ids) == 1)
 		{

From ba2c973353fb13d98636bcff50326016ee429556 Mon Sep 17 00:00:00 2001
From: pmleconte <pascal.leconte@conseilgouz.com>
Date: Sat, 28 May 2022 08:13:43 +0200
Subject: [PATCH 03/11] Add inlineHelp toogle button to modules and plugins

---
 administrator/components/com_modules/forms/module.xml          | 3 +++
 administrator/components/com_modules/forms/moduleadmin.xml     | 3 +++
 .../components/com_modules/src/View/Module/HtmlView.php        | 1 +
 administrator/components/com_plugins/forms/plugin.xml          | 3 +++
 .../components/com_plugins/src/View/Plugin/HtmlView.php        | 1 +
 5 files changed, 11 insertions(+)

diff --git a/administrator/components/com_modules/forms/module.xml b/administrator/components/com_modules/forms/module.xml
index ca92bd2c76782..3166ca932fc88 100644
--- a/administrator/components/com_modules/forms/module.xml
+++ b/administrator/components/com_modules/forms/module.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
+	<config>         
+		<inlinehelp button="show"/>     
+	</config>
 	<fieldset addfieldprefix="Joomla\Component\Modules\Administrator\Field">
 		<field
 			name="id"
diff --git a/administrator/components/com_modules/forms/moduleadmin.xml b/administrator/components/com_modules/forms/moduleadmin.xml
index 4f2b7efa84e93..f5a14c42f8ce0 100644
--- a/administrator/components/com_modules/forms/moduleadmin.xml
+++ b/administrator/components/com_modules/forms/moduleadmin.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
 	<fieldset addfieldprefix="Joomla\Component\Modules\Administrator\Field">
+		<config>         
+			<inlinehelp button="show"/>     
+		</config>
 		<field
 			name="id"
 			type="number"
diff --git a/administrator/components/com_modules/src/View/Module/HtmlView.php b/administrator/components/com_modules/src/View/Module/HtmlView.php
index 0fa6388aacf7b..7f59fa17c8712 100644
--- a/administrator/components/com_modules/src/View/Module/HtmlView.php
+++ b/administrator/components/com_modules/src/View/Module/HtmlView.php
@@ -165,5 +165,6 @@ protected function addToolbar()
 		}
 
 		ToolbarHelper::help($help->key, false, $url);
+		ToolbarHelper::inlinehelp();
 	}
 }
diff --git a/administrator/components/com_plugins/forms/plugin.xml b/administrator/components/com_plugins/forms/plugin.xml
index 37a70c983ca3b..f4da40fc6031b 100644
--- a/administrator/components/com_plugins/forms/plugin.xml
+++ b/administrator/components/com_plugins/forms/plugin.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form addfieldprefix="Joomla\Component\Plugins\Administrator\Field">
 	<fieldset>
+		<config>         
+			<inlinehelp button="show"/>     
+		</config>
 		<field
 			name="extension_id"
 			type="text"
diff --git a/administrator/components/com_plugins/src/View/Plugin/HtmlView.php b/administrator/components/com_plugins/src/View/Plugin/HtmlView.php
index 019454e1ce133..bf04879aca37a 100644
--- a/administrator/components/com_plugins/src/View/Plugin/HtmlView.php
+++ b/administrator/components/com_plugins/src/View/Plugin/HtmlView.php
@@ -113,5 +113,6 @@ protected function addToolbar()
 		}
 
 		ToolbarHelper::help($help->key, false, $url);
+		ToolbarHelper::inlinehelp();
 	}
 }

From 178af2285e64be6131a492291468894597b57ed4 Mon Sep 17 00:00:00 2001
From: pmleconte <pascal.leconte@conseilgouz.com>
Date: Sat, 28 May 2022 08:30:26 +0200
Subject: [PATCH 04/11] Update TagModel.php

---
 components/com_tags/src/Model/TagModel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/com_tags/src/Model/TagModel.php b/components/com_tags/src/Model/TagModel.php
index 4458a02be93f4..7a99186e536b3 100644
--- a/components/com_tags/src/Model/TagModel.php
+++ b/components/com_tags/src/Model/TagModel.php
@@ -186,7 +186,7 @@ protected function populateState($ordering = 'c.core_title', $direction = 'ASC')
 		$this->setState('params', $params);
 
 		// Load state from the request.
-		$ids = (array) $app->input->get('id', array(), 'int');
+		$ids = (array) $app->input->get('id', array());
 
 		if (count($ids) == 1)
 		{

From a80fc548ba2b6b57feeb77227c55adc9bbc79f75 Mon Sep 17 00:00:00 2001
From: conseilgouz <pascal.leconte@conseilgouz.com>
Date: Sat, 28 May 2022 20:14:49 +0200
Subject: [PATCH 05/11] Update
 administrator/components/com_plugins/src/View/Plugin/HtmlView.php

Co-authored-by: Quy <quy@fluxbb.org>
---
 .../components/com_plugins/src/View/Plugin/HtmlView.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_plugins/src/View/Plugin/HtmlView.php b/administrator/components/com_plugins/src/View/Plugin/HtmlView.php
index bf04879aca37a..888a2303002ab 100644
--- a/administrator/components/com_plugins/src/View/Plugin/HtmlView.php
+++ b/administrator/components/com_plugins/src/View/Plugin/HtmlView.php
@@ -112,7 +112,7 @@ protected function addToolbar()
 			$url = null;
 		}
 
-		ToolbarHelper::help($help->key, false, $url);
 		ToolbarHelper::inlinehelp();
+		ToolbarHelper::help($help->key, false, $url);
 	}
 }

From 49c1218eb27875f206cfab3743b9d8e6ee965922 Mon Sep 17 00:00:00 2001
From: conseilgouz <pascal.leconte@conseilgouz.com>
Date: Sat, 28 May 2022 20:15:24 +0200
Subject: [PATCH 06/11] Update HtmlView.php

---
 .../components/com_modules/src/View/Module/HtmlView.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_modules/src/View/Module/HtmlView.php b/administrator/components/com_modules/src/View/Module/HtmlView.php
index 7f59fa17c8712..98b3f402b6e27 100644
--- a/administrator/components/com_modules/src/View/Module/HtmlView.php
+++ b/administrator/components/com_modules/src/View/Module/HtmlView.php
@@ -164,7 +164,7 @@ protected function addToolbar()
 			$url = null;
 		}
 
-		ToolbarHelper::help($help->key, false, $url);
 		ToolbarHelper::inlinehelp();
+		ToolbarHelper::help($help->key, false, $url);
 	}
 }

From 7bf3a7791a7e63f801ca192e52dbb7b2c0c90beb Mon Sep 17 00:00:00 2001
From: conseilgouz <pascal.leconte@conseilgouz.com>
Date: Wed, 1 Jun 2022 09:41:15 +0200
Subject: [PATCH 07/11] Update inlinehelp.es6.js

---
 build/media_source/system/js/inlinehelp.es6.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/build/media_source/system/js/inlinehelp.es6.js b/build/media_source/system/js/inlinehelp.es6.js
index 7ce26f6f1f8b0..2644c437964ca 100644
--- a/build/media_source/system/js/inlinehelp.es6.js
+++ b/build/media_source/system/js/inlinehelp.es6.js
@@ -41,6 +41,13 @@ Joomla.toggleInlineHelp = (toggleClass) => {
   .forEach((elToggler) => {
     // The class of the DIVs to toggle visibility on is defined by the data-class attribute of the click target.
     const toggleClass = elToggler.dataset.class ?? 'hide-aware-inline-help';
+    const collection = document.getElementsByClassName(toggleClass);
+  
+    if (collection.length == 0) { // no description => hide inlinehelp button
+      elToggler.classList.add('d-none');
+      return;
+    }
+ 
     // Add the click handler.
     elToggler.addEventListener('click', (event) => {
       event.preventDefault();

From de905402304d78193fc9e79ba40b9dca1493154c Mon Sep 17 00:00:00 2001
From: conseilgouz <pascal.leconte@conseilgouz.com>
Date: Wed, 1 Jun 2022 10:00:42 +0200
Subject: [PATCH 08/11] Update inlinehelp.es6.js

---
 build/media_source/system/js/inlinehelp.es6.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build/media_source/system/js/inlinehelp.es6.js b/build/media_source/system/js/inlinehelp.es6.js
index 2644c437964ca..764c2d4726620 100644
--- a/build/media_source/system/js/inlinehelp.es6.js
+++ b/build/media_source/system/js/inlinehelp.es6.js
@@ -42,12 +42,13 @@ Joomla.toggleInlineHelp = (toggleClass) => {
     // The class of the DIVs to toggle visibility on is defined by the data-class attribute of the click target.
     const toggleClass = elToggler.dataset.class ?? 'hide-aware-inline-help';
     const collection = document.getElementsByClassName(toggleClass);
-  
-    if (collection.length == 0) { // no description => hide inlinehelp button
+
+     // no description => hide inlinehelp button
+    if (collection.length === 0) {
       elToggler.classList.add('d-none');
       return;
     }
- 
+
     // Add the click handler.
     elToggler.addEventListener('click', (event) => {
       event.preventDefault();

From 59b162e468d2bf91c6b63def7d1cda9f3d1a27b4 Mon Sep 17 00:00:00 2001
From: conseilgouz <pascal.leconte@conseilgouz.com>
Date: Wed, 1 Jun 2022 10:01:41 +0200
Subject: [PATCH 09/11] Update inlinehelp.es6.js

---
 build/media_source/system/js/inlinehelp.es6.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/media_source/system/js/inlinehelp.es6.js b/build/media_source/system/js/inlinehelp.es6.js
index 764c2d4726620..6236b9581f02c 100644
--- a/build/media_source/system/js/inlinehelp.es6.js
+++ b/build/media_source/system/js/inlinehelp.es6.js
@@ -43,7 +43,7 @@ Joomla.toggleInlineHelp = (toggleClass) => {
     const toggleClass = elToggler.dataset.class ?? 'hide-aware-inline-help';
     const collection = document.getElementsByClassName(toggleClass);
 
-     // no description => hide inlinehelp button
+    // no description => hide inlinehelp button
     if (collection.length === 0) {
       elToggler.classList.add('d-none');
       return;

From e34ef9d774f5fe25cbaf34b5c9d579bf129478d9 Mon Sep 17 00:00:00 2001
From: conseilgouz <pascal.leconte@conseilgouz.com>
Date: Wed, 8 Jun 2022 07:25:35 +0200
Subject: [PATCH 10/11] Update plugin.xml

Fix from https://github.com/cyrezdev
---
 administrator/components/com_plugins/forms/plugin.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/administrator/components/com_plugins/forms/plugin.xml b/administrator/components/com_plugins/forms/plugin.xml
index f4da40fc6031b..f85c48b9c30a3 100644
--- a/administrator/components/com_plugins/forms/plugin.xml
+++ b/administrator/components/com_plugins/forms/plugin.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form addfieldprefix="Joomla\Component\Plugins\Administrator\Field">
+	<config>         
+		<inlinehelp button="show"/>     
+	</config>
 	<fieldset>
-		<config>         
-			<inlinehelp button="show"/>     
-		</config>
 		<field
 			name="extension_id"
 			type="text"

From 473631f693d87fe4d591985e7e85f2a27ef7ce18 Mon Sep 17 00:00:00 2001
From: conseilgouz <pascal.leconte@conseilgouz.com>
Date: Wed, 8 Jun 2022 16:31:30 +0200
Subject: [PATCH 11/11] Update moduleadmin.xml

---
 administrator/components/com_modules/forms/moduleadmin.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/administrator/components/com_modules/forms/moduleadmin.xml b/administrator/components/com_modules/forms/moduleadmin.xml
index f5a14c42f8ce0..4ab9d09023d15 100644
--- a/administrator/components/com_modules/forms/moduleadmin.xml
+++ b/administrator/components/com_modules/forms/moduleadmin.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
+	<config>         
+		<inlinehelp button="show"/>     
+	</config>
 	<fieldset addfieldprefix="Joomla\Component\Modules\Administrator\Field">
-		<config>         
-			<inlinehelp button="show"/>     
-		</config>
 		<field
 			name="id"
 			type="number"