Merge pull request #43654 from bembelimen/upmerges/2024-06-15

[5.1] Upmerges 2024-06-15

administrator/components/com_associations/src/Helper/AssociationsHelper.php

@@ -72,7 +72,7 @@ public static function getAssociationList($extensionName, $typeName, $itemId)
     }
 
     /**
-     * Get the the instance of the extension helper class
+     * Get the instance of the extension helper class
      *
      * @param   string  $extensionName  The extension name with com_
      *

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

@@ -527,7 +527,7 @@ public function compareUpdateVersion($extension)
     /**
      * Get a message of the tables skipped and checked
      *
-     * @param   array  $status  status of of the update files
+     * @param   array  $status  status of the update files
      *
      * @return  array  Messages with the errors with the update version
      *

administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue

@@ -80,7 +80,7 @@ export default {
     },
   },
   methods: {
-    /* Check if the the form is valid */
+    /* Check if the form is valid */
     isValid() {
       return (this.folder);
     },

administrator/components/com_messages/src/Field/UserMessagesField.php

@@ -78,7 +78,7 @@ protected function getGroups()
     /**
      * Method to get the users to exclude from the list of users
      *
-     * @return  array|null array of users to exclude or null to to not exclude them
+     * @return  array|null array of users to exclude or null to not exclude them
      *
      * @since   1.6
      */

administrator/language/en-GB/plg_content_pagenavigation.ini

@@ -4,6 +4,7 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_CONTENT_PAGENAVIGATION="Content - Page Navigation"
+PLG_PAGENAVIGATION_ARIA_LABEL="Page Navigation"
 PLG_PAGENAVIGATION_FIELD_DISPLAY_LABEL="Link Text"
 PLG_PAGENAVIGATION_FIELD_POSITION_LABEL="Position"
 PLG_PAGENAVIGATION_FIELD_RELATIVE_LABEL="Relative To"

installation/sql/mysql/base.sql

@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `#__assets` (
   `lft` int NOT NULL DEFAULT 0 COMMENT 'Nested set lft.',
   `rgt` int NOT NULL DEFAULT 0 COMMENT 'Nested set rgt.',
   `level` int unsigned NOT NULL COMMENT 'The cached level in the nested tree.',
-  `name` varchar(50) NOT NULL COMMENT 'The unique name for the asset.\n',
+  `name` varchar(50) NOT NULL COMMENT 'The unique name for the asset.',
   `title` varchar(100) NOT NULL COMMENT 'The descriptive title for the asset.',
   `rules` varchar(5120) NOT NULL COMMENT 'JSON encoded access control.',
   PRIMARY KEY (`id`),

libraries/src/Form/Field/UserField.php

@@ -163,7 +163,7 @@ protected function getGroups()
     /**
      * Method to get the users to exclude from the list of users
      *
-     * @return  string[]  Array of users to exclude or null to to not exclude them
+     * @return  string[]  Array of users to exclude or null to not exclude them
      *
      * @since   1.6
      */

libraries/src/HTML/Helpers/Select.php

@@ -350,10 +350,10 @@ public static function integerlist($start, $end, $inc, $name, $attribs = null, $
      *                             option.label: The property in each option array to use as the
      *                             selection label attribute. If a "label" option is provided, defaults to
      *                             "label", if no label is given, defaults to null (none).
-     *                             option.text: The property that will hold the the displayed text.
+     *                             option.text: The property that will hold the displayed text.
      *                             Defaults to "text". If set to null, the option array is assumed to be a
      *                             list of displayable scalars.
-     * @param   string   $optText  The property that will hold the the displayed text. This
+     * @param   string   $optText  The property that will hold the displayed text. This
      *                             parameter is ignored if an options array is passed.
      * @param   boolean  $disable  Not used.
      *
@@ -445,7 +445,7 @@ public static function option($value, $text = '', $optKey = 'value', $optText =
      *                                Defaults to "disable".
      *                               -option.key: The property that will hold the selection value.
      *                                Defaults to "value".
-     *                               -option.text: The property that will hold the the displayed text.
+     *                               -option.text: The property that will hold the displayed text.
      *                               Defaults to "text". If set to null, the option array is assumed to be a
      *                               list of displayable scalars.
      * @param   string   $optText    The name of the object variable for the option text.

libraries/src/Helper/TagsHelper.php

@@ -297,7 +297,7 @@ public function createTagsFromField($tags)
     }
 
     /**
-     * Method to delete the tag mappings and #__ucm_content record for for an item
+     * Method to delete the tag mappings and #__ucm_content record for an item
      *
      * @param   TableInterface  $table          Table object of content table where delete occurred
      * @param   integer|array   $contentItemId  ID of the content item. Or an array of key/value pairs with array key
@@ -338,7 +338,7 @@ public function deleteTagData(TableInterface $table, $contentItemId)
      * @param   integer  $id           Id of the item to retrieve tags for.
      * @param   boolean  $getTagData   If true, data from the tags table will be included, defaults to true.
      *
-     * @return  array    Array of of tag objects
+     * @return  array    Array of tag objects
      *
      * @since   3.1
      */
@@ -397,7 +397,7 @@ public function getItemTags($contentType, $id, $getTagData = true)
      * @param   array    $ids          Id of the item to retrieve tags for.
      * @param   boolean  $getTagData   If true, data from the tags table will be included, defaults to true.
      *
-     * @return  array    Array of of tag objects grouped by Id.
+     * @return  array    Array of tag objects grouped by Id.
      *
      * @since   4.2.0
      */
@@ -766,7 +766,7 @@ public function getTagTreeArray($id, &$tagTreeArray = [])
      * @param   array    $selectTypes  Optional array of type ids or aliases to limit the results to. Often from a request.
      * @param   boolean  $useAlias     If true, the alias is used to match, if false the type_id is used.
      *
-     * @return  array   Array of of types
+     * @return  array   Array of types
      *
      * @since   3.1
      */

libraries/src/Layout/BaseLayout.php

@@ -266,7 +266,7 @@ public function set($key, $value)
     }
 
     /**
-     * Set the the data passed the layout
+     * Set the data passed the layout
      *
      * @param   array  $data  Array with the data for the layout
      *

libraries/src/MVC/View/HtmlView.php

@@ -348,7 +348,7 @@ public function addHelperPath($path)
      *
      * @param   string  $tpl  The name of the template source file; automatically searches the template paths and compiles as needed.
      *
-     * @return  string  The output of the the template script.
+     * @return  string  The output of the template script.
      *
      * @since   3.0
      * @throws  \Exception

plugins/content/pagenavigation/tmpl/default.php

@@ -13,10 +13,12 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
+$this->loadLanguage();
+
 $lang = $this->getLanguage();
 ?>
 
-<nav class="pagenavigation">
+<nav class="pagenavigation" aria-label="<?php echo Text::_('PLG_PAGENAVIGATION_ARIA_LABEL'); ?>">
     <span class="pagination ms-0">
     <?php if ($row->prev) :
         $direction = $lang->isRtl() ? 'right' : 'left'; ?>

plugins/quickicon/eos/src/Extension/Eos.php

@@ -81,7 +81,7 @@ public static function getSubscribedEvents(): array
     }
 
     /**
-     * Check and show the the alert.
+     * Check and show the alert.
      *
      * This method is called when the Quick Icons module is constructing its set
      * of icons.

plugins/sampledata/testing/language/en-GB/en-GB.plg_sampledata_testing.ini

@@ -69,7 +69,7 @@ PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_7_NAME="Shop Address"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_7_SUBURB="Our Province"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_7_TELEPHONE="555-555-5555"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_00_FULLTEXT=""
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_00_INTROTEXT="<p>All components are also used in the administrator area of your website. In addition to the ones listed here, there are components in the administrator that do not have direct front end displays, but do help shape your site. The most important ones for most users are</p><ul><li>Media Manager</li><li>Extensions Manager</li><li>Menu Manager</li><li>Global Configuration</li><li>Banners</li><li>Redirect</li></ul><hr title='Media Manager' alt='Media Manager' class='system-pagebreak' style='color: gray; border: 1px dashed gray;' /><p> </p><h3>Media Manager</h3><p>The media manager component lets you upload and insert images into content throughout your site. Optionally, you can enable the flash uploader which will allow you to to upload multiple images. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help40:Content_Media_Manager'>Help</a></p><hr title='Extensions Manager' alt='Extensions Manager' class='system-pagebreak' style='color: gray; border: 1px dashed gray;' /><h3>Extensions Manager</h3><p>The extensions manager lets you install, update, uninstall and manage all of your extensions. The extensions manager has been extensively redesigned, although the core install and uninstall functionality remains the same as in Joomla! 1.5. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help40:Extensions_Extension_Manager_Install'>Help</a></p><hr title='Menu Manager' alt='Menu Manager' class='system-pagebreak' style='color: gray; border: 1px dashed gray;' /><h3>Menu Manager</h3><p>The menu manager lets you create the menus you see displayed on your site. It also allows you to assign modules and template styles to specific menu links. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help40:Menus_Menu_Manager'>Help</a></p><hr title='Global Configuration' alt='Global Configuration' class='system-pagebreak' style='color: gray; border: 1px dashed gray;' /><h3>Global Configuration</h3><p>The global configuration is where the site administrator configures things such as whether search engine friendly urls are enabled, the site meta data (descriptive text used by search engines and indexers) and other functions. For many beginning users leaving the settings on default is a good way to begin, although when your site is ready for the public you will want to change the meta data to match its content. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help40:Site_Global_Configuration'>Help</a></p><hr title='Banners' alt='Banners' class='system-pagebreak' style='color: gray; border: 1px dashed gray;' /><h3>Banners</h3><p>The banners component provides a simple way to display a rotating image in a module and, if you wish to have advertising, a way to track the number of times an image is viewed and clicked. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help40:Components_Banners_Banners_Edit'>Help</a></p><hr title='Redirect' class='system-pagebreak' /><h3><br>Redirect</h3><p>The redirect component is used to manage broken links that produce Page Not Found (404) errors. If enabled it will allow you to redirect broken links to specific pages. It can also be used to manage migration related URL changes. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help40:Components_Redirect_Manager'>Help</a></p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_00_INTROTEXT="<p>All components are also used in the administrator area of your website. In addition to the ones listed here, there are components in the administrator that do not have direct front end displays, but do help shape your site. The most important ones for most users are</p><ul><li>Media Manager</li><li>Extensions Manager</li><li>Menu Manager</li><li>Global Configuration</li><li>Banners</li><li>Redirect</li></ul><hr title='Media Manager' alt='Media Manager' class='system-pagebreak' style='color: gray; border: 1px dashed gray;' /><p> </p><h3>Media Manager</h3><p>The media manager component lets you upload and insert images into content throughout your site. Optionally, you can enable the flash uploader which will allow you to upload multiple images. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help40:Content_Media_Manager'>Help</a></p><hr title='Extensions Manager' alt='Extensions Manager' class='system-pagebreak' style='color: gray; border: 1px dashed gray;' /><h3>Extensions Manager</h3><p>The extensions manager lets you install, update, uninstall and manage all of your extensions. The extensions manager has been extensively redesigned, although the core install and uninstall functionality remains the same as in Joomla! 1.5. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help40:Extensions_Extension_Manager_Install'>Help</a></p><hr title='Menu Manager' alt='Menu Manager' class='system-pagebreak' style='color: gray; border: 1px dashed gray;' /><h3>Menu Manager</h3><p>The menu manager lets you create the menus you see displayed on your site. It also allows you to assign modules and template styles to specific menu links. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help40:Menus_Menu_Manager'>Help</a></p><hr title='Global Configuration' alt='Global Configuration' class='system-pagebreak' style='color: gray; border: 1px dashed gray;' /><h3>Global Configuration</h3><p>The global configuration is where the site administrator configures things such as whether search engine friendly urls are enabled, the site meta data (descriptive text used by search engines and indexers) and other functions. For many beginning users leaving the settings on default is a good way to begin, although when your site is ready for the public you will want to change the meta data to match its content. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help40:Site_Global_Configuration'>Help</a></p><hr title='Banners' alt='Banners' class='system-pagebreak' style='color: gray; border: 1px dashed gray;' /><h3>Banners</h3><p>The banners component provides a simple way to display a rotating image in a module and, if you wish to have advertising, a way to track the number of times an image is viewed and clicked. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help40:Components_Banners_Banners_Edit'>Help</a></p><hr title='Redirect' class='system-pagebreak' /><h3><br>Redirect</h3><p>The redirect component is used to manage broken links that produce Page Not Found (404) errors. If enabled it will allow you to redirect broken links to specific pages. It can also be used to manage migration related URL changes. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help40:Components_Redirect_Manager'>Help</a></p>"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_00_TITLE="Administrator Components"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_01_FULLTEXT=""
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_01_INTROTEXT="<p>This module shows a list of the calendar months containing archived articles. After you have changed the status of an article to archived, this list will be automatically generated. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help40:Extensions_Module_Manager_Articles_Archive' title='Archive Module'>Help</a></p><div class='sample-module'>{loadmodule articles_archive,Archived Articles}</div>"

plugins/system/schedulerunner/src/Extension/ScheduleRunner.php

@@ -152,7 +152,7 @@ public function runLazyCron(EventInterface $e)
             return;
         }
 
-        // Since the the request from the frontend may time out, try allowing execution after disconnect.
+        // Since the request from the frontend may time out, try allowing execution after disconnect.
         if (\function_exists('ignore_user_abort')) {
             ignore_user_abort(true);
         }

templates/cassiopeia/component.php

@@ -32,7 +32,7 @@
         $this->getPreloadManager()->preconnect('https://fonts.googleapis.com/', ['crossorigin' => 'anonymous']);
         $this->getPreloadManager()->preconnect('https://fonts.gstatic.com/', ['crossorigin' => 'anonymous']);
         $this->getPreloadManager()->preload($paramsFontScheme, ['as' => 'style', 'crossorigin' => 'anonymous']);
-        $wa->registerAndUseStyle('fontscheme.current', $paramsFontScheme, [], ['media' => 'print', 'rel' => 'lazy-stylesheet', 'onload' => 'this.media=\'all\'', 'crossorigin' => 'anonymous']);
+        $wa->registerAndUseStyle('fontscheme.current', $paramsFontScheme, [], ['rel' => 'lazy-stylesheet', 'crossorigin' => 'anonymous']);
 
         if (preg_match_all('/family=([^?:]*):/i', $paramsFontScheme, $matches) > 0) {
             $fontStyles = '--cassiopeia-font-family-body: "' . str_replace('+', ' ', $matches[1][0]) . '", sans-serif;
@@ -41,7 +41,7 @@
 			--cassiopeia-font-weight-headings: 700;';
         }
     } else {
-        $wa->registerAndUseStyle('fontscheme.current', $paramsFontScheme, ['version' => 'auto'], ['media' => 'print', 'rel' => 'lazy-stylesheet', 'onload' => 'this.media=\'all\'']);
+        $wa->registerAndUseStyle('fontscheme.current', $paramsFontScheme, ['version' => 'auto'], ['rel' => 'lazy-stylesheet']);
         $this->getPreloadManager()->preload($wa->getAsset('style', 'fontscheme.current')->getUri() . '?' . $this->getMediaVersion(), ['as' => 'style']);
     }
 }

templates/cassiopeia/error.php

@@ -45,7 +45,7 @@
         $this->getPreloadManager()->preconnect('https://fonts.googleapis.com/', ['crossorigin' => 'anonymous']);
         $this->getPreloadManager()->preconnect('https://fonts.gstatic.com/', ['crossorigin' => 'anonymous']);
         $this->getPreloadManager()->preload($paramsFontScheme, ['as' => 'style', 'crossorigin' => 'anonymous']);
-        $wa->registerAndUseStyle('fontscheme.current', $paramsFontScheme, [], ['media' => 'print', 'rel' => 'lazy-stylesheet', 'onload' => 'this.media=\'all\'', 'crossorigin' => 'anonymous']);
+        $wa->registerAndUseStyle('fontscheme.current', $paramsFontScheme, [], ['rel' => 'lazy-stylesheet', 'crossorigin' => 'anonymous']);
 
         if (preg_match_all('/family=([^?:]*):/i', $paramsFontScheme, $matches) > 0) {
             $fontStyles = '--cassiopeia-font-family-body: "' . str_replace('+', ' ', $matches[1][0]) . '", sans-serif;
@@ -54,7 +54,7 @@
 			--cassiopeia-font-weight-headings: 700;';
         }
     } else {
-        $wa->registerAndUseStyle('fontscheme.current', $paramsFontScheme, ['version' => 'auto'], ['media' => 'print', 'rel' => 'lazy-stylesheet', 'onload' => 'this.media=\'all\'']);
+        $wa->registerAndUseStyle('fontscheme.current', $paramsFontScheme, ['version' => 'auto'], ['rel' => 'lazy-stylesheet']);
         $this->getPreloadManager()->preload($wa->getAsset('style', 'fontscheme.current')->getUri() . '?' . $this->getMediaVersion(), ['as' => 'style']);
     }
 }

templates/cassiopeia/index.php

@@ -49,7 +49,7 @@
         $this->getPreloadManager()->preconnect('https://fonts.googleapis.com/', ['crossorigin' => 'anonymous']);
         $this->getPreloadManager()->preconnect('https://fonts.gstatic.com/', ['crossorigin' => 'anonymous']);
         $this->getPreloadManager()->preload($paramsFontScheme, ['as' => 'style', 'crossorigin' => 'anonymous']);
-        $wa->registerAndUseStyle('fontscheme.current', $paramsFontScheme, [], ['media' => 'print', 'rel' => 'lazy-stylesheet', 'onload' => 'this.media=\'all\'', 'crossorigin' => 'anonymous']);
+        $wa->registerAndUseStyle('fontscheme.current', $paramsFontScheme, [], ['rel' => 'lazy-stylesheet', 'crossorigin' => 'anonymous']);
 
         if (preg_match_all('/family=([^?:]*):/i', $paramsFontScheme, $matches) > 0) {
             $fontStyles = '--cassiopeia-font-family-body: "' . str_replace('+', ' ', $matches[1][0]) . '", sans-serif;
@@ -70,7 +70,7 @@
     		--cassiopeia-font-weight-headings: 700;';
         }
     } else {
-        $wa->registerAndUseStyle('fontscheme.current', $paramsFontScheme, ['version' => 'auto'], ['media' => 'print', 'rel' => 'lazy-stylesheet', 'onload' => 'this.media=\'all\'']);
+        $wa->registerAndUseStyle('fontscheme.current', $paramsFontScheme, ['version' => 'auto'], ['rel' => 'lazy-stylesheet']);
         $this->getPreloadManager()->preload($wa->getAsset('style', 'fontscheme.current')->getUri() . '?' . $this->getMediaVersion(), ['as' => 'style']);
     }
 }