Upmerge 3.10 to 4.1.1

[joomlapl-bot]

PR w związku ze zmianą oryginału joomla/joomla-cms#37311 Poniżej zmiany w oryginale:

Click to expand the diff!

diff --git a/administrator/language/en-GB/plg_user_terms.ini b/administrator/language/en-GB/plg_user_terms.ini
index 3e4c96cd596f..389ef2010935 100644
--- a/administrator/language/en-GB/plg_user_terms.ini
+++ b/administrator/language/en-GB/plg_user_terms.ini
@@ -14,5 +14,6 @@ PLG_USER_TERMS_NOTE_FIELD_DEFAULT="By signing up to this website you accept the
 PLG_USER_TERMS_NOTE_FIELD_DESC="A summary of the site's terms & conditions. If left blank then the default message will be used."
 PLG_USER_TERMS_NOTE_FIELD_LABEL="Short Terms & Conditions"
 PLG_USER_TERMS_OPTION_AGREE="I agree"
+PLG_USER_TERMS_OPTION_DO_NOT_AGREE="I do not agree"
 PLG_USER_TERMS_SUBJECT="Privacy Policy"
 PLG_USER_TERMS_XML_DESCRIPTION="Basic plugin to request user's consent to the site's terms and conditions."
diff --git a/components/com_banners/src/Model/BannerModel.php b/components/com_banners/src/Model/BannerModel.php
index 3e1786870a53..6154089218da 100644
--- a/components/com_banners/src/Model/BannerModel.php
+++ b/components/com_banners/src/Model/BannerModel.php
@@ -88,7 +88,8 @@ public function click()
 
 		if ($trackClicks > 0)
 		{
-			$trackDate = Factory::getDate()->toSql();
+			$trackDate = Factory::getDate()->format('Y-m-d H:00:00');
+			$trackDate = Factory::getDate($trackDate)->toSql();
 
 			$query = $db->getQuery(true);
 
diff --git a/components/com_banners/src/Model/BannersModel.php b/components/com_banners/src/Model/BannersModel.php
index 96d891b524da..a16c7dc63942 100644
--- a/components/com_banners/src/Model/BannersModel.php
+++ b/components/com_banners/src/Model/BannersModel.php
@@ -312,7 +312,8 @@ public function getItems()
 	 */
 	public function impress()
 	{
-		$trackDate = Factory::getDate()->toSql();
+		$trackDate = Factory::getDate()->format('Y-m-d H:00:00');
+		$trackDate = Factory::getDate($trackDate)->toSql();
 		$items     = $this->getItems();
 		$db        = $this->getDbo();
 		$bid       = [];
diff --git a/plugins/user/terms/forms/terms.xml b/plugins/user/terms/forms/terms.xml
index ef2ab43c5d27..323f1b2923d1 100644
--- a/plugins/user/terms/forms/terms.xml
+++ b/plugins/user/terms/forms/terms.xml
@@ -14,7 +14,7 @@
 				required="true"
 				>
 				<option value="1">PLG_USER_TERMS_OPTION_AGREE</option>
-				<option value="0">JNO</option>
+				<option value="0">PLG_USER_TERMS_OPTION_DO_NOT_AGREE</option>
 			</field>
 		</fieldset>
 	</fields>

[wojsmol]

https://github.com/joomla/joomla-cms/pull/37311/files?file-filters%5B%5D=.ini&show-viewed-files=true