Merge remote-tracking branch 'Joomla/5.2-dev' into upmerges/2024-08-15

Author: softforge

administrator/components/com_config/src/View/Application/HtmlView.php

@@ -71,14 +71,14 @@ class HtmlView extends BaseHtmlView
      *
      * @var    string
      */
-    protected $formclass;
+    public $formclass;
 
     /**
      * Description of the fieldset
      *
      * @var    string
      */
-    protected $description;
+    public $description;
 
     /**
      * Execute and display a template script.

administrator/components/com_contact/config.xml

@@ -980,8 +980,9 @@
 		<field
 			name="custom_reply"
 			type="radio"
-			layout="joomla.form.field.radio.switcher"
 			label="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL"
+			description="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_DESC"
+			layout="joomla.form.field.radio.switcher"
 			default="0"
 			showon="show_email_form:1"
 			>

administrator/components/com_contact/forms/contact.xml

@@ -742,6 +742,7 @@
 					name="custom_reply"
 					type="list"
 					label="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL"
+					description="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_DESC"
 					useglobal="true"
 					validate="options"
 					>

administrator/components/com_installer/src/Model/UpdatesitesModel.php

@@ -554,7 +554,7 @@ protected function getListQuery()
 
         // Process select filters.
         $supported = $this->getState('filter.supported');
-        $enabled   = $this->getState('filter.enabled');
+        $enabled   = $this->getState('filter.enabled', '');
         $type      = $this->getState('filter.type');
         $clientId  = $this->getState('filter.client_id');
         $folder    = $this->getState('filter.folder');

administrator/components/com_languages/src/Model/OverridesModel.php

@@ -165,7 +165,13 @@ protected function populateState($ordering = 'key', $direction = 'asc')
         $client          = substr($language_client, -1);
         $language        = substr($language_client, 0, -1);
 
+        // Sets the search filter.
+        $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+        $this->setState('filter.search', $search);
+
         $this->setState('language_client', $language . $client);
+        $this->setState('filter.client', $client ? 'administrator' : 'site');
+        $this->setState('filter.language', $language);
 
         // Add the 'language_client' value to the session to display a message if none selected
         $app->setUserState('com_languages.overrides.language_client', $language . $client);

administrator/language/en-GB/com_contact.ini

@@ -36,6 +36,7 @@ COM_CONTACT_FIELD_CONFIG_CATEGORIES_DESC="These settings apply for Contact Categ
 COM_CONTACT_FIELD_CONFIG_CATEGORY_DESC="These settings apply for Contact Category Options unless they are changed for a specific menu item."
 COM_CONTACT_FIELD_CONFIG_CONTACT_FORM="Form"
 COM_CONTACT_FIELD_CONFIG_COUNTRY_LABEL="Country"
+COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_DESC="Stops Joomla from sending the email, allowing for Plugins to handle integration with other systems."
 COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL="Custom Reply"
 COM_CONTACT_FIELD_CONFIG_FAX_LABEL="Fax"
 COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DESC="These settings apply for a single Contact unless they are changed for a specific menu item or Contact."

administrator/language/en-GB/plg_system_sef.ini

@@ -5,6 +5,8 @@
 
 PLG_SEF_DOMAIN_DESCRIPTION="If your site can be accessed through more than one domain enter the preferred (sometimes referred to as canonical) domain here. <br><strong>Note:</strong> https://example.com and https://www.example.com are different domains."
 PLG_SEF_DOMAIN_LABEL="Site Domain"
+PLG_SEF_ENFORCESUFFIX_DESCRIPTION="When enabled and \"Add Suffix to URL\" is also enabled, URLs without suffix will be redirected to the correct one. From version 6.0 onwards this will be the standard behavior and not an option anymore."
+PLG_SEF_ENFORCESUFFIX_LABEL="Enforce a suffix by redirect"
 PLG_SEF_INDEXPHP_DESCRIPTION="This option enables a stricter handling of 'index.php' in URLs when 'Use URL Rewriting' is enabled in Global Configuration. It will remove 'index.php' if a URL still contains it and redirect incoming requests with 'index.php' to the version without the 'index.php'."
 PLG_SEF_INDEXPHP_LABEL="Strict handling of index.php"
 PLG_SEF_STRICTROUTING_DESCRIPTION="Prevent the router from accepting a lot of URLs which are deemed as duplicates and will automatically redirect to the correct URL with a 301."

components/com_contact/tmpl/categories/default.xml

@@ -740,6 +740,7 @@
 				name="custom_reply"
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_DESC"
 				useglobal="true"
 				class="form-select-color-state"
 				validate="options"

components/com_contact/tmpl/category/default.xml

@@ -757,6 +757,7 @@
 				name="custom_reply"
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_DESC"
 				useglobal="true"
 				class="form-select-color-state"
 				validate="options"

components/com_contact/tmpl/contact/default.xml

@@ -444,6 +444,7 @@
 				name="custom_reply"
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_DESC"
 				useglobal="true"
 				class="form-select-color-state"
 				validate="options"