character_count, 0, Text::_('DECIMALS_SEPARATOR'), Text::_('THOUSANDS_SEPARATOR')); ?>
diff --git a/administrator/language/en-GB/mod_menu.ini b/administrator/language/en-GB/mod_menu.ini
index 4c207b1d27a99..8d7c3bb11964c 100644
--- a/administrator/language/en-GB/mod_menu.ini
+++ b/administrator/language/en-GB/mod_menu.ini
@@ -74,7 +74,7 @@ MOD_MENU_HELP_SECURITY="Security Centre"
MOD_MENU_HELP_SHOP="Joomla! Shop"
MOD_MENU_HELP_SUPPORT_CUSTOM_FORUM="Custom Support Forum" ; Will be used if the localised sample data has a URL for the desired community forum or if the 'Custom Support Forum' field parameter in the Administrator Menu module has a URL
MOD_MENU_HELP_SUPPORT_OFFICIAL_FORUM="Official Support Forum"
-MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM="Official Language Forums" ; If you have displayed the specific language forum, use something like "Official French Forum" in your language.
+MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM="Official Language Forums" ; If you have displayed the specific language forum, use something like 'Official French Forum' in your language.
MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE="511" ; The # of the specific language forum in https://forum.joomla.org/ (example: 19 for French). Default is '511' which is the section for all languages forums.
MOD_MENU_HELP_TRANSLATIONS="Joomla! Translations"
MOD_MENU_HELP_USER_GROUPS="Joomla User Groups"
diff --git a/administrator/language/en-GB/plg_fields_imagelist.ini b/administrator/language/en-GB/plg_fields_imagelist.ini
index 650be93932c80..58649f4686f6f 100644
--- a/administrator/language/en-GB/plg_fields_imagelist.ini
+++ b/administrator/language/en-GB/plg_fields_imagelist.ini
@@ -5,7 +5,7 @@
PLG_FIELDS_IMAGELIST="Fields - Imagelist"
PLG_FIELDS_IMAGELIST_LABEL="List of Images (%s)"
-PLG_FIELDS_IMAGELIST_PARAMS_DIRECTORY_DESC="This directory is relative to \"images\" directory in Joomla! root." ; Don't translate "images"
+PLG_FIELDS_IMAGELIST_PARAMS_DIRECTORY_DESC="This directory is relative to \"images\" directory in Joomla! root." ; Don't translate 'images'
PLG_FIELDS_IMAGELIST_PARAMS_DIRECTORY_LABEL="Directory"
PLG_FIELDS_IMAGELIST_PARAMS_IMAGE_CLASS_LABEL="Image Class"
PLG_FIELDS_IMAGELIST_PARAMS_MULTIPLE_LABEL="Multiple"
diff --git a/build/media_source/com_finder/js/finder.es6.js b/build/media_source/com_finder/js/finder.es6.js
index 61870b2d04faf..bad4f34fc40c3 100644
--- a/build/media_source/com_finder/js/finder.es6.js
+++ b/build/media_source/com_finder/js/finder.es6.js
@@ -22,7 +22,9 @@
try {
response = JSON.parse(xhr.responseText);
} catch (e) {
- Joomla.renderMessages(Joomla.ajaxErrorsMessages(xhr, 'parsererror'));
+ // Something went wrong, but we are not going to bother the enduser with this
+ // eslint-disable-next-line no-console
+ console.error(e);
return;
}
@@ -30,7 +32,9 @@
target.awesomplete.list = response.suggestions;
}
}).catch((xhr) => {
- Joomla.renderMessages(Joomla.ajaxErrorsMessages(xhr));
+ // Something went wrong, but we are not going to bother the enduser with this
+ // eslint-disable-next-line no-console
+ console.error(xhr);
});
}
};
diff --git a/components/com_contact/src/Model/ContactModel.php b/components/com_contact/src/Model/ContactModel.php
index a86a56a7879ab..940f01dc59cbb 100644
--- a/components/com_contact/src/Model/ContactModel.php
+++ b/components/com_contact/src/Model/ContactModel.php
@@ -104,7 +104,7 @@ protected function populateState()
*/
public function getForm($data = [], $loadData = true)
{
- $form = $this->loadForm('com_contact.contact', 'contact', ['control' => 'jform', 'load_data' => true]);
+ $form = $this->loadForm('com_contact.contact', 'contact', ['control' => 'jform', 'load_data' => $loadData]);
if (empty($form)) {
return false;
diff --git a/libraries/src/Installer/InstallerScript.php b/libraries/src/Installer/InstallerScript.php
index 4a4f27deb27f5..23bb71499f6c7 100644
--- a/libraries/src/Installer/InstallerScript.php
+++ b/libraries/src/Installer/InstallerScript.php
@@ -141,7 +141,7 @@ public function preflight($type, $parent)
// Abort if the extension being installed is not newer than the currently installed version
if (!$this->allowDowngrades && strtolower($type) === 'update') {
- $manifest = $this->getItemArray('manifest_cache', '#__extensions', 'element', $this->extension);
+ $manifest = $this->getItemArray('manifest_cache', '#__extensions', 'name', $this->extension);
// Check whether we have an old release installed and skip this check when this here is the initial install.
if (!isset($manifest['version'])) {
@@ -301,7 +301,9 @@ public function getItemArray($element, $table, $column, $identifier)
$db->setQuery($query);
// Load the single cell and json_decode data
- return json_decode($db->loadResult(), true);
+ $result = $db->loadResult();
+
+ return $result === null ? [] : json_decode($result, true);
}
/**
```
PR w związku ze zmianą oryginału https://github.com/joomla/joomla-cms/pull/42497 Poniżej zmiany w oryginale:
Click to expand the diff!
```diff diff --git a/administrator/components/com_contenthistory/tmpl/history/modal.php b/administrator/components/com_contenthistory/tmpl/history/modal.php index 173a7ff775382..8cb4cf0947a45 100644 --- a/administrator/components/com_contenthistory/tmpl/history/modal.php +++ b/administrator/components/com_contenthistory/tmpl/history/modal.php @@ -100,7 +100,7 @@