[5.1] Upmerge 2023-12-17

[jgerman-bot]

New language relevant PR in upstream repo: https://github.com/joomla/joomla-cms/pull/42535 Here are the upstream changes:

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 @@ - editor); ?> + editor) ? $item->editor_user_id : htmlspecialchars($item->editor); ?> 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/forms/filter_contacts.xml b/components/com_contact/forms/filter_contacts.xml index 06c568d1dbc8d..1f9b4663ec570 100644 --- a/components/com_contact/forms/filter_contacts.xml +++ b/components/com_contact/forms/filter_contacts.xml @@ -14,8 +14,7 @@ JOPTION_SELECT_PUBLISHED @@ -36,8 +35,7 @@ JOPTION_SELECT_ACCESS @@ -46,8 +44,7 @@ JOPTION_SELECT_LANGUAGE @@ -68,8 +65,7 @@ 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/components/com_content/forms/filter_articles.xml b/components/com_content/forms/filter_articles.xml index 8e32d2309aea3..942c28dd13209 100644 --- a/components/com_content/forms/filter_articles.xml +++ b/components/com_content/forms/filter_articles.xml @@ -13,8 +13,7 @@ JOPTION_SELECT_PUBLISHED @@ -23,7 +22,7 @@ JOPTION_SELECT_LANGUAGE @@ -95,8 +92,7 @@ diff --git a/components/com_fields/forms/filter_fields.xml b/components/com_fields/forms/filter_fields.xml index f70974a517168..d0df3cc0a15d0 100644 --- a/components/com_fields/forms/filter_fields.xml +++ b/components/com_fields/forms/filter_fields.xml @@ -15,7 +15,8 @@ name="search" type="text" inputmode="search" - label="" + label="COM_FIELDS_FIELDS_FILTER_SEARCH_LABEL" + description="COM_FIELDS_FIELDS_FILTER_SEARCH_DESC" hint="JSEARCH_FILTER" class="js-stools-search-string" /> @@ -23,6 +24,7 @@ JOPTION_SELECT_PUBLISHED @@ -40,6 +42,7 @@ COM_FIELDS_VIEW_FIELDS_SELECT_CATEGORY @@ -48,6 +51,7 @@ JOPTION_SELECT_ACCESS @@ -56,6 +60,7 @@ JOPTION_SELECT_LANGUAGE @@ -95,8 +100,7 @@ diff --git a/components/com_menus/forms/filter_items.xml b/components/com_menus/forms/filter_items.xml index 03fbe69a26e40..e62d9745c41fc 100644 --- a/components/com_menus/forms/filter_items.xml +++ b/components/com_menus/forms/filter_items.xml @@ -24,8 +24,7 @@ @@ -34,8 +33,7 @@ JOPTION_SELECT_ACCESS @@ -43,8 +41,7 @@ JOPTION_SELECT_LANGUAGE @@ -53,8 +50,7 @@ diff --git a/components/com_modules/forms/filter_modules.xml b/components/com_modules/forms/filter_modules.xml index f91ea07dcddc5..88792585ab208 100644 --- a/components/com_modules/forms/filter_modules.xml +++ b/components/com_modules/forms/filter_modules.xml @@ -31,8 +31,7 @@ JOPTION_SELECT_ACCESS @@ -72,8 +71,7 @@ diff --git a/installation/src/Application/CliInstallationApplication.php b/installation/src/Application/CliInstallationApplication.php index 77ccaace502ee..7562d13f6f595 100644 --- a/installation/src/Application/CliInstallationApplication.php +++ b/installation/src/Application/CliInstallationApplication.php @@ -76,6 +76,14 @@ final class CliInstallationApplication extends Application implements CMSApplica */ protected $session; + /** + * The client application Id + * + * @var Integer + * @since __DEPLOY_VERSION__ + */ + protected $clientId; + /** * Class constructor. * diff --git a/language/en-GB/joomla.ini b/language/en-GB/joomla.ini index 72ef5e17e6513..b8048f816915c 100644 --- a/language/en-GB/joomla.ini +++ b/language/en-GB/joomla.ini @@ -310,6 +310,7 @@ JGLOBAL_FIELD_VERSION_NOTE_LABEL="Version Note" JGLOBAL_FIELDS="Fields" JGLOBAL_FILTER_BUTTON="Filter" JGLOBAL_FILTER_LABEL="Filter" +JGLOBAL_FILTERED_BY="Filtered by:" JGLOBAL_FULL_TEXT="Full Text" JGLOBAL_GT=">" JGLOBAL_HITS="Hits" @@ -325,9 +326,11 @@ JGLOBAL_LEARN_MORE="Learn More" JGLOBAL_LEFT="Left" JGLOBAL_LIST_ALIAS="(Alias: %s)" JGLOBAL_LIST_ALIAS_NOTE="(Alias: %s, Note: %s)" +JGLOBAL_LIST_LIMIT="Select number of items per page." JGLOBAL_LOOKING_FOR="Looking for" JGLOBAL_LT="<" JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT="Maximum upload size: %s" +JGLOBAL_MAXLEVEL_LABEL="Subcategory Levels" JGLOBAL_NAME_ASC="Name ascending" JGLOBAL_NAME_DESC="Name descending" JGLOBAL_NEWITEMSLAST_DESC="New items default to the last position. Ordering can be changed after this item has been saved." @@ -355,6 +358,7 @@ JGLOBAL_SELECT_NO_RESULTS_MATCH="No results match" JGLOBAL_SELECT_PRESS_TO_SELECT="Press to select" JGLOBAL_SELECT_SOME_OPTIONS="Select some options" JGLOBAL_SORT_BY="Sort Table By:" +JGLOBAL_SORTED_BY="Sorted by:" JGLOBAL_START_PUBLISH_AFTER_FINISH="Item start publishing date must be before finish publishing date" JGLOBAL_SUBCATEGORIES="Subcategories" JGLOBAL_TITLE="Title" diff --git a/libraries/src/Installer/Adapter/PackageAdapter.php b/libraries/src/Installer/Adapter/PackageAdapter.php index 5bd1b0dd97aef..022802d6f181c 100644 --- a/libraries/src/Installer/Adapter/PackageAdapter.php +++ b/libraries/src/Installer/Adapter/PackageAdapter.php @@ -115,15 +115,20 @@ protected function checkExtensionInFilesystem() */ protected function copyBaseFiles() { - $folder = (string) $this->getManifest()->files->attributes()->folder; $source = $this->parent->getPath('source'); - if ($folder) { - $source .= '/' . $folder; + $attributes = $this->getManifest()->files->attributes(); + + if ($attributes) { + $folder = (string) $attributes->folder; + + if ($folder) { + $source .= '/' . $folder; + } } // Install all necessary files - if (!\count($this->getManifest()->files->children())) { + if (!$this->getManifest()->files->count()) { throw new \RuntimeException( Text::sprintf( 'JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES', 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); } /** diff --git a/libraries/src/Updater/Update.php b/libraries/src/Updater/Update.php index 10c1a5242ccb6..8b277e78046ac 100644 --- a/libraries/src/Updater/Update.php +++ b/libraries/src/Updater/Update.php @@ -237,6 +237,10 @@ class Update protected $stability; protected $supported_databases; protected $php_minimum; + public $sha256; + public $sha384; + public $sha512; + protected $section; /** * Gets the reference to the current direct parent ```

[tecpromotion]

see e34a03254fcc96a99bfffe80fa6bab7c3be27305