[5.1] Upmerge 2024-02-27 (#42902)

Author: LadySolveig

.github/workflows/create-translation-pull-request-v5.yml

@@ -73,5 +73,5 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.API_TOKEN_GITHUB }}
         run: |
-          gh pr list -R joomla/joomla-cms --state open --author joomla-translation-bot -S "Translation Update" | grep -v "No pull" || \
-            gh pr create --title "Translation Update" --body "Automatically created pull request based on core-translation repository changes" -R joomla/joomla-cms --base 5.0-dev
+          gh pr list -R joomla/joomla-cms --state open --author joomla-translation-bot -S "[5.x] Translation Update" | grep -v "No pull" || \
+            gh pr create --title "[5.x] Translation Update" --body "Automatically created pull request based on core-translation repository changes" -R joomla/joomla-cms --base 5.0-dev

administrator/components/com_finder/src/Indexer/Token.php

@@ -144,8 +144,9 @@ public function __construct($term, $lang, $spacer = ' ')
         // Tokens can be a single word or an array of words representing a phrase.
         if (\is_array($term)) {
             // Populate the token instance.
+            $langs         = array_fill(0, \count($term), $lang);
             $this->term    = implode($spacer, $term);
-            $this->stem    = implode($spacer, array_map([Helper::class, 'stem'], $term, [$lang]));
+            $this->stem    = implode($spacer, array_map([Helper::class, 'stem'], $term, $langs));
             $this->numeric = false;
             $this->common  = false;
             $this->phrase  = true;

administrator/components/com_tags/tmpl/tags/emptystate.php

@@ -15,7 +15,7 @@
 $displayData = [
     'textPrefix' => 'COM_TAGS',
     'formURL'    => 'index.php?option=com_tags&task=tag.add',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/J3.x:How_To_Use_Content_Tags_in_Joomla!',
+    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/J4.x:How_To_Use_Content_Tags_in_Joomla',
     'icon'       => 'icon-tags tags',
 ];
 

administrator/components/com_users/src/Controller/MethodController.php

@@ -385,9 +385,6 @@ public function save($cachable = false, $urlparams = []): void
             $url = Route::_($nonSefUrl, false);
             $this->setRedirect($url, $record->getError(), 'error');
 
-            // Method updated, destroy other active sessions
-            UserHelper::destroyUserSessions($userId, true);
-
             return;
         }
 

administrator/components/com_users/src/Controller/UserController.php

@@ -118,8 +118,8 @@ public function save($key = null, $urlVar = null)
         }
 
         // If a user has to renew a password but has no permission for users
-        if (!$this->app->getIdentity()->authorise('core.admin', 'com_users')) {
-            $this->setRedirect('index.php');
+        if ($task === 'save' && !$this->app->getIdentity()->authorise('core.manage', 'com_users')) {
+            $this->setRedirect(Uri::base());
         }
 
         return $result;

administrator/language/en-GB/lib_joomla.ini

@@ -347,6 +347,7 @@ JLIB_FORM_SELECT_USER="Select a User"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Invalid field: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Field required: %s"
 JLIB_FORM_VALIDATE_FIELD_RULE_MISSING="Validation Rule missing: %s"
+JLIB_FORM_VALIDATE_FIELD_URL_INJECTION_DETECTED="Invalid URL: A code injection has been detected in %1$s."
 JLIB_FORM_VALIDATE_FIELD_URL_SCHEMA_MISSING="Invalid URL: URL schema is missing in %1$s. Please add one of the following at the beginning: %2$s."
 JLIB_FORM_VALIDATE_FIELD_URL_INJECTION_DETECTED="Invalid URL: A code injection has been detected in %1$s."
 JLIB_FORM_VALUE_CACHE_APCU="APC User Cache"

administrator/modules/mod_feed/tmpl/default.php

@@ -56,7 +56,7 @@
             </h2>
         <?php endif;
         // Feed date
-        if ($params->get('rssdate', 1)) : ?>
+        if ($params->get('rssdate', 1) && ($feed->publishedDate !== null)) : ?>
             <h3>
             <?php echo HTMLHelper::_('date', $feed->publishedDate, Text::_('DATE_FORMAT_LC3')); ?>
             </h3>
@@ -93,7 +93,7 @@
                         <h5 class="feed-link"><?php echo trim($feed[$i]->title); ?></h5>
                     <?php endif; ?>
 
-                    <?php if ($params->get('rssitemdate', 0)) : ?>
+                    <?php if ($params->get('rssitemdate', 0)  && $feed[$i]->publishedDate !== null) : ?>
                         <div class="feed-item-date">
                             <?php echo HTMLHelper::_('date', $feed[$i]->publishedDate, Text::_('DATE_FORMAT_LC3')); ?>
                         </div>

build/media_source/legacy/js/toolbar.es5.js

@@ -43,7 +43,7 @@ Joomla = window.Joomla || {};
     // Handle Help buttons
     document.querySelectorAll('.js-toolbar-help-btn').forEach((button) => {
       button.addEventListener('click', (event) => {
-        const btn = event.target;
+        const btn = event.currentTarget;
         const winprops = `height=${parseInt(btn.dataset.height, 10)},width=${parseInt(btn.dataset.width, 10)},top=${(window.innerHeight - parseInt(btn.dataset.height, 10)) / 2},`
           + `left=${(window.innerWidth - parseInt(btn.dataset.width, 10)) / 2},scrollbars=${btn.dataset.width === 'true'},resizable`;