Merge branch '5.2-dev' into due_tasks

Author: zero-24

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"

build/media_source/templates/administrator/atum/scss/blocks/_treeselect.scss

@@ -64,7 +64,7 @@
     display: inline-block;
     padding: 0;
     margin-right: .1rem;
-    color: var(--atum-btn-bg);
+    color: var(--template-link-color);
     text-align: center;
     cursor: pointer;
   }

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
      */