From ec05a39c0270c2666ce782ada2c2b5d7fa2ac4e8 Mon Sep 17 00:00:00 2001
From: Shubhamverma2796 <54266411+Shubhamverma2796@users.noreply.github.com>
Date: Wed, 24 Nov 2021 00:31:48 +0530
Subject: [PATCH 1/5] Validated type=number in Modules (#36091)

* Validated type=number

* Update modules/mod_users_latest/mod_users_latest.xml

Co-authored-by: Quy <quy@fluxbb.org>

Co-authored-by: Quy <quy@fluxbb.org>
---
 modules/mod_articles_latest/mod_articles_latest.xml | 2 ++
 modules/mod_articles_news/mod_articles_news.xml     | 2 ++
 modules/mod_banners/mod_banners.xml                 | 2 ++
 modules/mod_feed/mod_feed.xml                       | 2 ++
 modules/mod_related_items/mod_related_items.xml     | 2 ++
 modules/mod_users_latest/mod_users_latest.xml       | 2 ++
 6 files changed, 12 insertions(+)

diff --git a/modules/mod_articles_latest/mod_articles_latest.xml b/modules/mod_articles_latest/mod_articles_latest.xml
index a9f694e06b8b5..0f11f8f45dcf7 100644
--- a/modules/mod_articles_latest/mod_articles_latest.xml
+++ b/modules/mod_articles_latest/mod_articles_latest.xml
@@ -39,6 +39,8 @@
 					label="MOD_LATEST_NEWS_FIELD_COUNT_LABEL"
 					default="5"
 					filter="integer"
+					min="1"
+					validate="number"
 				/>
 
 				<field
diff --git a/modules/mod_articles_news/mod_articles_news.xml b/modules/mod_articles_news/mod_articles_news.xml
index 9a4791f1a1956..b441db422b0c0 100644
--- a/modules/mod_articles_news/mod_articles_news.xml
+++ b/modules/mod_articles_news/mod_articles_news.xml
@@ -165,6 +165,8 @@
 					label="MOD_ARTICLES_NEWS_FIELD_ITEMS_LABEL"
 					default="5"
 					filter="integer"
+					min="1"
+					validate="number"
 				/>
 
 				<field
diff --git a/modules/mod_banners/mod_banners.xml b/modules/mod_banners/mod_banners.xml
index 29d1fa2037fc9..72939431ce718 100644
--- a/modules/mod_banners/mod_banners.xml
+++ b/modules/mod_banners/mod_banners.xml
@@ -48,6 +48,8 @@
 					default="5"
 					filter="integer"
 					class="validate-numeric"
+					min="1"
+					validate="number"
 				/>
 
 				<field
diff --git a/modules/mod_feed/mod_feed.xml b/modules/mod_feed/mod_feed.xml
index 304235c47d44b..5cb96b44a7707 100644
--- a/modules/mod_feed/mod_feed.xml
+++ b/modules/mod_feed/mod_feed.xml
@@ -98,6 +98,8 @@
 					label="MOD_FEED_FIELD_ITEMS_LABEL"
 					default="3"
 					filter="integer"
+					min="1"
+					validate="number"
 				/>
 
 				<field
diff --git a/modules/mod_related_items/mod_related_items.xml b/modules/mod_related_items/mod_related_items.xml
index 4adc9f6839913..815966d2aca24 100644
--- a/modules/mod_related_items/mod_related_items.xml
+++ b/modules/mod_related_items/mod_related_items.xml
@@ -41,6 +41,8 @@
 					label="MOD_RELATED_FIELD_MAX_LABEL"
 					default="5"
 					filter="integer"
+					min="1"
+					validate="number"
 				/>
 			</fieldset>
 			<fieldset name="advanced">
diff --git a/modules/mod_users_latest/mod_users_latest.xml b/modules/mod_users_latest/mod_users_latest.xml
index 089f8c42a8f68..2acf115f8f84d 100644
--- a/modules/mod_users_latest/mod_users_latest.xml
+++ b/modules/mod_users_latest/mod_users_latest.xml
@@ -29,6 +29,8 @@
 					label="MOD_USERS_LATEST_FIELD_NUMBER_LABEL"
 					default="5"
 					filter="integer"
+					min="1"
+					validate="number"
 				/>
 
 				<field

From 280d0e0e3af7e6b91e2a286a24e772365df5d334 Mon Sep 17 00:00:00 2001
From: Quy <quy@fluxbb.org>
Date: Wed, 24 Nov 2021 05:44:37 -0800
Subject: [PATCH 2/5] Change markup of No matching results alert (#36098)

---
 .../components/com_mails/tmpl/templates/default.php          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/administrator/components/com_mails/tmpl/templates/default.php b/administrator/components/com_mails/tmpl/templates/default.php
index f25ee2e8b7c08..ffd679b8a51e7 100644
--- a/administrator/components/com_mails/tmpl/templates/default.php
+++ b/administrator/components/com_mails/tmpl/templates/default.php
@@ -28,7 +28,10 @@
 				echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
 				?>
 				<?php if (empty($this->items)) : ?>
-					<joomla-alert type="warning"><?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?></joomla-alert>
+					<div class="alert alert-info">
+						<span class="icon-info-circle" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
+						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+					</div>
 				<?php else : ?>
 					<table class="table" id="templateList">
 						<caption class="visually-hidden">

From aee692bf7e9a16f1ca220d5436af662a868b1f5e Mon Sep 17 00:00:00 2001
From: Shubhamverma2796 <54266411+Shubhamverma2796@users.noreply.github.com>
Date: Wed, 24 Nov 2021 20:46:54 +0530
Subject: [PATCH 3/5] Validated type=number in Administrator Modules (#36100)

---
 administrator/modules/mod_custom/mod_custom.xml               | 2 ++
 administrator/modules/mod_feed/mod_feed.xml                   | 4 ++++
 administrator/modules/mod_latest/mod_latest.xml               | 2 ++
 administrator/modules/mod_latestactions/mod_latestactions.xml | 4 ++++
 administrator/modules/mod_logged/mod_logged.xml               | 2 ++
 administrator/modules/mod_loginsupport/mod_loginsupport.xml   | 2 ++
 administrator/modules/mod_popular/mod_popular.xml             | 2 ++
 .../modules/mod_privacy_dashboard/mod_privacy_dashboard.xml   | 2 ++
 .../modules/mod_privacy_status/mod_privacy_status.xml         | 2 ++
 administrator/modules/mod_quickicon/mod_quickicon.xml         | 2 ++
 administrator/modules/mod_stats_admin/mod_stats_admin.xml     | 2 ++
 11 files changed, 26 insertions(+)

diff --git a/administrator/modules/mod_custom/mod_custom.xml b/administrator/modules/mod_custom/mod_custom.xml
index 0c44d1fa66557..8da47896dc3fc 100644
--- a/administrator/modules/mod_custom/mod_custom.xml
+++ b/administrator/modules/mod_custom/mod_custom.xml
@@ -72,6 +72,8 @@
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					default="900"
 					filter="integer"
+					min="1"
+					validate="number"
 				/>
 			</fieldset>
 		</fields>
diff --git a/administrator/modules/mod_feed/mod_feed.xml b/administrator/modules/mod_feed/mod_feed.xml
index a9f8aad8ab6c7..eaba2cf3102f8 100644
--- a/administrator/modules/mod_feed/mod_feed.xml
+++ b/administrator/modules/mod_feed/mod_feed.xml
@@ -86,6 +86,8 @@
 					label="MOD_FEED_FIELD_ITEMS_LABEL"
 					default="3"
 					filter="integer"
+					min="1"
+					validate="number"
 				/>
 
 				<field
@@ -147,6 +149,8 @@
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
  					default="900"
 					filter="integer"
+					min="1"
+					validate="number"
 				/>
 			</fieldset>
 		</fields>
diff --git a/administrator/modules/mod_latest/mod_latest.xml b/administrator/modules/mod_latest/mod_latest.xml
index dc95fab957411..ebc2b2f7eef67 100644
--- a/administrator/modules/mod_latest/mod_latest.xml
+++ b/administrator/modules/mod_latest/mod_latest.xml
@@ -29,6 +29,8 @@
 					label="MOD_LATEST_FIELD_COUNT_LABEL"
 					default="5"
 					filter="integer"
+					min="1"
+					validate="number"
 				/>
 
 				<field
diff --git a/administrator/modules/mod_latestactions/mod_latestactions.xml b/administrator/modules/mod_latestactions/mod_latestactions.xml
index b6dcfd6c3060b..2578420dd7582 100644
--- a/administrator/modules/mod_latestactions/mod_latestactions.xml
+++ b/administrator/modules/mod_latestactions/mod_latestactions.xml
@@ -29,6 +29,8 @@
 					label="MOD_LATESTACTIONS_FIELD_COUNT_LABEL"
 					default="5"
 					filter="integer"
+					min="1"
+					validate="number"
 				/>
 			</fieldset>
 			<fieldset name="advanced">
@@ -78,6 +80,8 @@
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					default="900"
 					filter="integer"
+					min="1"
+					validate="number"
 				/>
 
 				<field
diff --git a/administrator/modules/mod_logged/mod_logged.xml b/administrator/modules/mod_logged/mod_logged.xml
index 37ab440ac558b..e03fd72f6c5df 100644
--- a/administrator/modules/mod_logged/mod_logged.xml
+++ b/administrator/modules/mod_logged/mod_logged.xml
@@ -29,6 +29,8 @@
 					label="MOD_LOGGED_FIELD_COUNT_LABEL"
 					default="5"
 					filter="integer"
+					min="1"
+					validate="number"
 				/>
 
 				<field
diff --git a/administrator/modules/mod_loginsupport/mod_loginsupport.xml b/administrator/modules/mod_loginsupport/mod_loginsupport.xml
index 39de7df476390..40ed518617675 100644
--- a/administrator/modules/mod_loginsupport/mod_loginsupport.xml
+++ b/administrator/modules/mod_loginsupport/mod_loginsupport.xml
@@ -96,6 +96,8 @@
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					default="0"
 					filter="integer"
+					min="0"
+					validate="number"
 				/>
 
 				<field
diff --git a/administrator/modules/mod_popular/mod_popular.xml b/administrator/modules/mod_popular/mod_popular.xml
index 6eb2603431dbb..08ccb9953bdd2 100644
--- a/administrator/modules/mod_popular/mod_popular.xml
+++ b/administrator/modules/mod_popular/mod_popular.xml
@@ -29,6 +29,8 @@
 					label="MOD_POPULAR_FIELD_COUNT_LABEL"
 					default="5"
 					filter="integer"
+					min="1"
+					validate="number"
 				/>
 
 				<field
diff --git a/administrator/modules/mod_privacy_dashboard/mod_privacy_dashboard.xml b/administrator/modules/mod_privacy_dashboard/mod_privacy_dashboard.xml
index eb6f89cc3df4f..5c14b74459873 100644
--- a/administrator/modules/mod_privacy_dashboard/mod_privacy_dashboard.xml
+++ b/administrator/modules/mod_privacy_dashboard/mod_privacy_dashboard.xml
@@ -58,6 +58,8 @@
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					default="900"
 					filter="integer"
+					min="1"
+					validate="number"
 				/>
 
 				<field
diff --git a/administrator/modules/mod_privacy_status/mod_privacy_status.xml b/administrator/modules/mod_privacy_status/mod_privacy_status.xml
index f580447c10372..69c7a6c547cdc 100644
--- a/administrator/modules/mod_privacy_status/mod_privacy_status.xml
+++ b/administrator/modules/mod_privacy_status/mod_privacy_status.xml
@@ -56,6 +56,8 @@
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					default="900"
 					filter="integer"
+					min="1"
+					validate="number"
 				/>
 
 				<field
diff --git a/administrator/modules/mod_quickicon/mod_quickicon.xml b/administrator/modules/mod_quickicon/mod_quickicon.xml
index 102ff655cba13..668a182071794 100644
--- a/administrator/modules/mod_quickicon/mod_quickicon.xml
+++ b/administrator/modules/mod_quickicon/mod_quickicon.xml
@@ -202,6 +202,8 @@
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					default="900"
 					filter="integer"
+					min="1"
+					validate="number"
 				/>
 			</fieldset>
 		</fields>
diff --git a/administrator/modules/mod_stats_admin/mod_stats_admin.xml b/administrator/modules/mod_stats_admin/mod_stats_admin.xml
index b38dc8be7840d..a69afff8443b7 100644
--- a/administrator/modules/mod_stats_admin/mod_stats_admin.xml
+++ b/administrator/modules/mod_stats_admin/mod_stats_admin.xml
@@ -82,6 +82,8 @@
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					default="900"
 					filter="integer"
+					min="1"
+					validate="number"
 				/>
 
 				<field

From 93dc176cc04187aeb3acf80012de458bcd2786e7 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Thu, 25 Nov 2021 21:16:49 +0000
Subject: [PATCH 4/5] [4.0] codemirror update (#36110)

Updates codemirror to 5.64.0

Fix a crash that occurred in some situations with replacing marks across line breaks.
Make sure native scrollbars reset their position when hidden and re-shown.
vim bindings: Support C-u to delete back a line.
---
 package-lock.json                         | 14 +++++++-------
 package.json                              |  2 +-
 plugins/editors/codemirror/codemirror.xml |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c0a7a0531289c..b32513c3e5af5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
         "bootstrap": "^5.1.2",
         "choices.js": "^9.0.1",
         "chosen-js": "^1.8.7",
-        "codemirror": "^5.63.1",
+        "codemirror": "^5.64.0",
         "cropperjs": "^1.5.11",
         "diff": "^4.0.2",
         "dragula": "3.7.2",
@@ -2820,9 +2820,9 @@
       }
     },
     "node_modules/codemirror": {
-      "version": "5.63.3",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.63.3.tgz",
-      "integrity": "sha512-1C+LELr+5grgJYqwZKqxrcbPsHFHapVaVAloBsFBASbpLnQqLw1U8yXJ3gT5D+rhxIiSpo+kTqN+hQ+9ialIXw=="
+      "version": "5.64.0",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.64.0.tgz",
+      "integrity": "sha512-fqr6CtDQdJ6iNMbD8NX2gH2G876nNDk+TO1rrYkgWnqQdO3O1Xa9tK6q+psqhJJgE5SpbaDcgdfLmukoUVE8pg=="
     },
     "node_modules/color-convert": {
       "version": "1.9.3",
@@ -11683,9 +11683,9 @@
       }
     },
     "codemirror": {
-      "version": "5.63.3",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.63.3.tgz",
-      "integrity": "sha512-1C+LELr+5grgJYqwZKqxrcbPsHFHapVaVAloBsFBASbpLnQqLw1U8yXJ3gT5D+rhxIiSpo+kTqN+hQ+9ialIXw=="
+      "version": "5.64.0",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.64.0.tgz",
+      "integrity": "sha512-fqr6CtDQdJ6iNMbD8NX2gH2G876nNDk+TO1rrYkgWnqQdO3O1Xa9tK6q+psqhJJgE5SpbaDcgdfLmukoUVE8pg=="
     },
     "color-convert": {
       "version": "1.9.3",
diff --git a/package.json b/package.json
index 2d1151c824bd1..186e680965e9a 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "bootstrap": "^5.1.2",
     "choices.js": "^9.0.1",
     "chosen-js": "^1.8.7",
-    "codemirror": "^5.63.1",
+    "codemirror": "^5.64.0",
     "cropperjs": "^1.5.11",
     "diff": "^4.0.2",
     "dragula": "3.7.2",
diff --git a/plugins/editors/codemirror/codemirror.xml b/plugins/editors/codemirror/codemirror.xml
index e6e771fd7941c..626312c981649 100644
--- a/plugins/editors/codemirror/codemirror.xml
+++ b/plugins/editors/codemirror/codemirror.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="plugin" group="editors" method="upgrade">
 	<name>plg_editors_codemirror</name>
-	<version>5.63.3</version>
+	<version>5.64.0</version>
 	<creationDate>28 March 2011</creationDate>
 	<author>Marijn Haverbeke</author>
 	<authorEmail>marijnh@gmail.com</authorEmail>

From d66de710482275264b2e82178789c7268c0eeef1 Mon Sep 17 00:00:00 2001
From: Tuan Pham Ngoc <github@joomdonation.com>
Date: Fri, 26 Nov 2021 04:17:48 +0700
Subject: [PATCH 5/5] [4.0] Recreate namespace map on Joomla! update (#36094)

* Recreate namespace map on Joomla update

* CS
---
 .../components/com_joomlaupdate/src/Model/UpdateModel.php      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
index 2dc2c73c6a81f..9b42679dda75a 100644
--- a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
+++ b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
@@ -660,6 +660,9 @@ public function finaliseUpgrade()
 			return false;
 		}
 
+		// Re-create namespace map. It is needed when updating to a Joomla! version has new extension added
+		(new \JNamespacePsr4Map)->create();
+
 		$installer->manifest = $manifest;
 
 		$installer->setUpgrade(true);