Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev

joomla · Nov 25, 2021 · 9c23425 · 9c23425
2 parents 7b7a919 + d66de71
commit 9c23425
Show file tree

Hide file tree

Showing 22 changed files with 54 additions and 10 deletions.
diff --git 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);

diff --git 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">

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -215,6 +215,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
@@ -82,6 +82,8 @@
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					default="900"
 					filter="integer"
+					min="1"
+					validate="number"
 				/>
 
 				<field

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -29,6 +29,8 @@
 					label="MOD_USERS_LATEST_FIELD_NUMBER_LABEL"
 					default="5"
 					filter="integer"
+					min="1"
+					validate="number"
 				/>
 
 				<field

diff --git a/package-lock.json b/package-lock.json
diff --git 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
@@ -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>[email protected]</authorEmail>