Merge branch '5.1-dev' into mail_loadlanguage_file

joomla · May 18, 2024 · 3ccce67 · 3ccce67
2 parents a9ca414 + e0d355d
commit 3ccce67
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 29 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -7,19 +7,22 @@ You are welcome to submit a contribution for review and possible inclusion in th
 2) Follow the [Joomla! Coding Standards](https://developer.joomla.org/coding-standards.html).
 
 3) When filing an issue or opening a PR, please include a clear title and description. The title should be a short summary of an issue and, if possible, should include a reference to an open issue. For example, `Invalid Query in com_admin (Ref #1234)` would be sufficient. All issues and PRs should include a description with as much detail as possible.
-If it is a PR, include what the issue is, what the PR is addressing, testing instructions and environmental information (PHP version, database driver and version, and other data you can retrieve from your site's system information view) in case the issue is specific to certain environments. If additional information is needed, please be prepared to provide it as our community members review your submission.
+   If it is a PR, include what the issue is, what the PR is addressing, testing instructions and environmental information (PHP version, database driver and version, and other data you can retrieve from your site's system information view) in case the issue is specific to certain environments. If additional information is needed, please be prepared to provide it as our community members review your submission.
 
 4) Report security issues to the Joomla! Security Strike Team (JSST) at [email protected] or use the [JSST contact form](https://developer.joomla.org/contact-security-team.html). Please do not use the public tracker for security issues.
 
+5) If you have a feature request, then please open a discussion to define the feature request and discuss possible solutions. Discussions can be converted into issues when the request is defined sufficiently that a developer can start coding the feature. In this process you will get feedback from the maintainers, if the feature is something for the Joomla core distribution or not.
+
 Please be patient as not all items will be tested immediately (remember, all bug testing for the Joomla! CMS is done by volunteers) and be receptive to feedback about your code.
 
 #### Branches
-PRs should usually be made to the `4.3-dev` branch as this contains the most recent version of the code.
-There are other branches available which serve specific purposes.
+While 4.4 is in maintenance mode, ie we are still fixing bugs, PRs should be made to the `4.4-dev` branch. Merged bugfixes will be upmerged into the current 5.x branch. If a bug is only in the 5.x series the PR should be made to the current 5.x branch (currently 5.1).
+
 
 | Branch | Purpose |
 | ------ | ------- |
-| 3.10-dev | Branch for the Joomla 3.x series. The 3.10 series release will now only include security patches. |
-| 4.3-dev | Branch for the current minor Joomla version.|
-| 4.4-dev | Branch for the next minor Joomla version. Commits to 4.3-dev will be applied to this branch as well. |
-| 5.0-dev | Branch for the next major Joomla version. New features go into this branch. |
+| 4.4-dev | Branch for the current 4.x Joomla version. Currently in maintenance mode |
+| 5.1-dev | Branch for the current 5.x Joomla version. Bugfix only for 5.x go into this branch. |
+| 5.2-dev | Branch for the next minor 5.x Joomla version. New features go into this branch. |
+| 6.0-dev | Branch for the next major Joomla version. New features that include a b/c break have to go into this branch. |
+
diff --git a/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php b/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php
@@ -177,10 +177,10 @@ public static function getLogContentTypeParams($context)
      */
     public static function getHumanReadableLogMessage($log, $generateLinks = true)
     {
+        static::loadActionLogPluginsLanguage();
         static $links = [];
-
-        $message     = Text::_($log->message_language_key);
-        $messageData = json_decode($log->message, true);
+        $message      = Text::_($log->message_language_key);
+        $messageData  = json_decode($log->message, true);
 
         // Special handling for translation extension name
         if (isset($messageData['extension_name'])) {

diff --git a/administrator/components/com_joomlaupdate/extract.php b/administrator/components/com_joomlaupdate/extract.php
@@ -1400,6 +1400,9 @@ private function processTypeFileUncompressed(): bool
         if ($this->dataReadLength == 0) {
             // Before processing file data, ensure permissions are adequate
             $this->setCorrectPermissions($this->fileHeader->file);
+
+            // This file is changed during the script's operation so we clear the status cache.
+            clearstatcache($this->fileHeader->file);
         }
 
         // Open the output file
@@ -1491,6 +1494,9 @@ private function processTypeFileCompressed(): bool
         // Before processing file data, ensure permissions are adequate
         $this->setCorrectPermissions($this->fileHeader->file);
 
+        // This file is changed during the script's operation so we clear the status cache.
+        clearstatcache($this->fileHeader->file);
+
         // Open the output file
         $outfp = @fopen($this->fileHeader->realFile, 'wb');
 

diff --git a/administrator/components/com_users/tmpl/methods/list.php b/administrator/components/com_users/tmpl/methods/list.php
@@ -69,12 +69,10 @@ class="img-fluid"
                         <?php foreach ($method['active'] as $record) : ?>
                             <div class="com-users-methods-list-method-record d-flex flex-row flex-wrap justify-content-start border-top py-2">
                                 <div class="com-users-methods-list-method-record-info flex-grow-1 d-flex flex-column align-items-start gap-1">
-                                    <?php if ($methodName === 'backupcodes') : ?>
-                                        <?php if ($canAddEdit) : ?>
-                                            <div class="alert alert-info mt-1 w-100">
-                                                <?php echo Text::sprintf('COM_USERS_MFA_BACKUPCODES_PRINT_PROMPT_HEAD', Route::_('index.php?option=com_users&task=method.edit&id=' . (int) $record->id . ($this->returnURL ? '&returnurl=' . $this->escape(urlencode($this->returnURL)) : '') . '&user_id=' . $this->user->id)) ?>
-                                            </div>
-                                        <?php endif ?>
+                                    <?php if ($methodName === 'backupcodes' && $canAddEdit) : ?>
+                                        <div class="alert alert-info mt-1 w-100">
+                                            <?php echo Text::sprintf('COM_USERS_MFA_BACKUPCODES_PRINT_PROMPT_HEAD', Route::_('index.php?option=com_users&task=method.edit&id=' . (int) $record->id . ($this->returnURL ? '&returnurl=' . $this->escape(urlencode($this->returnURL)) : '') . '&user_id=' . $this->user->id), 'text-decoration-underline') ?>
+                                        </div>
                                     <?php else : ?>
                                         <h4 class="com-users-methods-list-method-record-title-container mb-1 fs-3">
                                             <?php if ($record->default) : ?>

diff --git a/administrator/language/en-GB/com_users.ini b/administrator/language/en-GB/com_users.ini
@@ -253,7 +253,7 @@ COM_USERS_MFA_ACTIVE="Uses Multi-factor Authentication"
 COM_USERS_MFA_ADD_AUTHENTICATOR_OF_TYPE="Add a new %s"
 COM_USERS_MFA_ADD_PAGE_HEAD="Add a Multi-factor Authentication Method"
 COM_USERS_MFA_BACKUPCODES_PRINT_PROMPT="Backup Codes let you log into the site if your regular Multi-factor Authentication method does not work or you no longer have access to it. Each code can be used <em>only once</em>."
-COM_USERS_MFA_BACKUPCODES_PRINT_PROMPT_HEAD="<a href=\"%s\">Print these codes</a> and keep them in your wallet."
+COM_USERS_MFA_BACKUPCODES_PRINT_PROMPT_HEAD="<a href=\"%1s\" class=\"%2s\">Print these codes</a> and keep them in your wallet."
 COM_USERS_MFA_BACKUPCODES_RESET="Regenerate Backup Codes"
 COM_USERS_MFA_BACKUPCODES_RESET_INFO="Use the \"Regenerate Backup Codes\" button on the toolbar to generate a new set of Backup Codes. We recommend that you do this if you think your Backup Codes are compromised, e.g. someone got hold of a printout with them, or if you are running low on available Backup Codes."
 COM_USERS_MFA_EDIT_FIELD_DEFAULT="Make this the default Multi-factor Authentication method"

diff --git a/components/com_users/tmpl/methods/list.php b/components/com_users/tmpl/methods/list.php
@@ -69,12 +69,10 @@ class="img-fluid"
                         <?php foreach ($method['active'] as $record) : ?>
                             <div class="com-users-methods-list-method-record d-flex flex-row flex-wrap justify-content-start border-top py-2">
                                 <div class="com-users-methods-list-method-record-info flex-grow-1 d-flex flex-column align-items-start gap-1">
-                                    <?php if ($methodName === 'backupcodes') : ?>
-                                        <?php if ($canAddEdit) : ?>
-                                            <div class="alert alert-info mt-1 w-100">
-                                                <?php echo Text::sprintf('COM_USERS_MFA_BACKUPCODES_PRINT_PROMPT_HEAD', Route::_('index.php?option=com_users&task=method.edit&id=' . (int) $record->id . ($this->returnURL ? '&returnurl=' . $this->escape(urlencode($this->returnURL)) : '') . '&user_id=' . $this->user->id)) ?>
-                                            </div>
-                                        <?php endif ?>
+                                    <?php if ($methodName === 'backupcodes' && $canAddEdit) : ?>
+                                        <div class="alert alert-info mt-1 w-100">
+                                            <?php echo Text::sprintf('COM_USERS_MFA_BACKUPCODES_PRINT_PROMPT_HEAD', Route::_('index.php?option=com_users&task=method.edit&id=' . (int) $record->id . ($this->returnURL ? '&returnurl=' . $this->escape(urlencode($this->returnURL)) : '') . '&user_id=' . $this->user->id), 'text-decoration-underline') ?>
+                                        </div>
                                     <?php else : ?>
                                         <h3 class="com-users-methods-list-method-record-title-container mb-1 fs-5">
                                             <?php if ($record->default) : ?>

diff --git a/installation/language/ca-ES/langmetadata.xml b/installation/language/ca-ES/langmetadata.xml
@@ -11,7 +11,7 @@
 	</files>
 	<metadata>
 		<name>Catalan (ca-ES)</name>
-		<nativeName>Català (Catalunya)</nativeName>
+		<nativeName>Català (ca-ES)</nativeName>
 		<tag>ca-ES</tag>
 		<rtl>0</rtl>
 	</metadata>

diff --git a/installation/language/nl-BE/joomla.ini b/installation/language/nl-BE/joomla.ini
@@ -81,11 +81,13 @@ INSTL_DATABASE_NAME_LABEL="Database naam"
 INSTL_DATABASE_NAME_MSG_MYSQL="De naam van de database is ongeldig. Het mag de volgende tekens NIET bevatten: \ /"
 INSTL_DATABASE_NAME_MSG_POSTGRES="De naam van de database is ongeldig. Deze moet beginnen met een letter, gevolgd door alfanumerieke tekens."
 INSTL_DATABASE_NO_SCHEMA="Er bestaat geen database schema voor dit database type."
+INSTL_DATABASE_PASSWORD_DESC="Voer het database wachtwoord in dat is aangemaakt of een wachtwoord dat door de host is verstrekt."
 INSTL_DATABASE_PREFIX_DESC="Een tabel voorvoegsel invoeren of de willekeurig gegenereerde gebruiken."
 INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Als een bestaande database gebruikt wordt met tabellen met dezelfde voorvoegsel, zal Joomla deze bestaande tabellen hernoemen door het voorvoegsel \"bak_\" toe te voegen."
 INSTL_DATABASE_PREFIX_MSG="Het voorvoegsel van de tabel moet beginnen met een letter, eventueel gevolgd door alfanumerieke tekens en een onderstrepingsteken"
 INSTL_DATABASE_RESPONSE_ERROR="Het installatieproces is mislukt."
 INSTL_DATABASE_TYPE_DESC="Selecteer het databasetype."
+INSTL_DATABASE_USER_DESC="Voer de gebruikersnaam in die is aangemaakt of een gebruikersnaam die door de host is verstrekt."
 INSTL_DATABASE_VALIDATION_ERROR="Controleer uw database inloggegevens, database type, database naam of hostname. Als u MySQL 8 geïnstalleerd heeft, lees dan deze <a href=\"https://docs.joomla.org/Joomla_and_MySQL_8#Workaround_to_get_Joomla_working_with_MySQL_8\" target=\"_blank\" rel=\"noopener noreferrer\">wiki</a> voor meer informatie."
 
 INSTL_CONNECT_DB="Databaseverbinding instellen"

diff --git a/installation/language/ta-IN/joomla.ini b/installation/language/ta-IN/joomla.ini
@@ -200,7 +200,7 @@ INSTL_SESSION_AUTO_START="Session Auto Start"
 INSTL_WRITABLE="%s-ஐ உருவாக்கப் போதுமான அனுமதி இல்லை."
 INSTL_ZIP_SUPPORT_AVAILABLE="Native ZIP Support"
 ; Global strings
-JADMINISTRATOR="நிர்வாகம்"
+JADMINISTRATOR="நிர்வாகி"
 JEMAIL="மின்-அஞ்சல்"
 JERROR="பிழை"
 JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="தங்கள் வேண்டுதலைச் செயலாக்கும்போது ஒரு பிழை ஏற்பட்டுள்ளது."

diff --git a/language/en-GB/com_users.ini b/language/en-GB/com_users.ini
@@ -45,7 +45,7 @@ COM_USERS_MAIL_SEND_FAILURE_SUBJECT="Error sending email"
 COM_USERS_MFA_ADD_AUTHENTICATOR_OF_TYPE="Add a new %s"
 COM_USERS_MFA_ADD_PAGE_HEAD="Add a Multi-factor Authentication Method"
 COM_USERS_MFA_BACKUPCODES_PRINT_PROMPT="Backup Codes let you log into the site if your regular Multi-factor Authentication method does not work or you no longer have access to it. Each code can be used <em>only once</em>."
-COM_USERS_MFA_BACKUPCODES_PRINT_PROMPT_HEAD="<a href=\"%s\">Print these codes</a> and keep them in your wallet."
+COM_USERS_MFA_BACKUPCODES_PRINT_PROMPT_HEAD="<a href=\"%1s\" class=\"%2s\">Print these codes</a> and keep them in your wallet."
 COM_USERS_MFA_BACKUPCODES_RESET="Regenerate Backup Codes"
 COM_USERS_MFA_BACKUPCODES_RESET_INFO="Use the button below to generate a new set of Backup Codes. We recommend that you do this if you think your Backup Codes are compromised, e.g. someone got hold of a printout with them, or if you are running low on available Backup Codes."
 COM_USERS_MFA_EDIT_FIELD_DEFAULT="Make this the default Multi-factor Authentication method"

diff --git a/plugins/filesystem/local/src/Adapter/LocalAdapter.php b/plugins/filesystem/local/src/Adapter/LocalAdapter.php
@@ -952,10 +952,8 @@ private function getThumbnail(string $path): string
      */
     private function createThumbnail(string $path, string $thumbnailPath): bool
     {
-        $image = new Image($path);
-
         try {
-            $image->createThumbnails([$this->thumbnailSize[0] . 'x' . $this->thumbnailSize[1]], $image::SCALE_INSIDE, \dirname($thumbnailPath), true);
+            (new Image($path))->createThumbnails([$this->thumbnailSize[0] . 'x' . $this->thumbnailSize[1]], Image::SCALE_INSIDE, \dirname($thumbnailPath), true);
         } catch (\Exception $e) {
             return false;
         }