Merge branch '4.3-dev' into inclusive-naming-2

administrator/components/com_actionlogs/src/Dispatcher/Dispatcher.php

@@ -18,14 +18,14 @@
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * ComponentDispatcher class for com_admin
+ * ComponentDispatcher class for com_actionlogs
  *
  * @since  4.2.7
  */
 class Dispatcher extends ComponentDispatcher
 {
     /**
-     * com_admin does not require check permission, so we override checkAccess method and have it empty
+     * Method to check component access permission
      *
      * @return  void
      *

administrator/components/com_actionlogs/src/Field/LogtypeField.php

@@ -21,7 +21,7 @@
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Field to load a list of all users that have logged actions
+ * Field to load a list of all extensions that have logged actions
  *
  * @since  3.9.0
  */

administrator/components/com_joomlaupdate/src/Controller/UpdateController.php

@@ -60,7 +60,7 @@ public function download()
         $message     = null;
         $messageType = null;
 
-        // The validation was not successful so abort.
+        // The validation was not successful so stop.
         if ($result['check'] === false) {
             $message     = Text::_('COM_JOOMLAUPDATE_VIEW_UPDATE_CHECKSUM_WRONG');
             $messageType = 'error';

administrator/components/com_joomlaupdate/src/Dispatcher/Dispatcher.php

@@ -18,7 +18,7 @@
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * ComponentDispatcher class for com_admin
+ * ComponentDispatcher class for com_joomlaupdate
  *
  * @since  4.0.0
  */

administrator/components/com_media/resources/scripts/components/browser/items/image.vue

@@ -77,7 +77,7 @@ export default {
       }
 
       return this.item.thumb_path.split(Joomla.getOptions('system.paths').rootFull).length > 1
-        ? `${this.item.thumb_path}?${api.mediaVersion}`
+        ? `${this.item.thumb_path}?${this.item.modified_date ? new Date(this.item.modified_date).valueOf() : api.mediaVersion}`
         : `${this.item.thumb_path}`;
     },
     width() {

administrator/components/com_users/src/Model/MethodsModel.php

@@ -95,7 +95,7 @@ public function deleteAll(?User $user = null): void
             $user = Factory::getApplication()->getIdentity() ?: $this->getCurrentUser();
         }
 
-        // If the user object is a guest (who can't have MFA) we abort with an error
+        // If the user object is a guest (who can't have MFA) we stop with an error
         if ($user->guest) {
             throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }

administrator/modules/mod_latestactions/src/Helper/LatestActionsHelper.php

@@ -27,7 +27,7 @@
 abstract class LatestActionsHelper
 {
     /**
-     * Get a list of articles.
+     * Get a list of logged actions.
      *
      * @param   Registry  &$params  The module parameters.
      *

build/media_source/plg_installer_webinstaller/js/client.es6.js

@@ -404,7 +404,7 @@ customElements.whenDefined('joomla-tab').then(() => {
   const installerTabs = document.getElementById('myTab');
   const link = installerTabs.querySelector('button[aria-controls=web]');
 
-  // Abort if the IFW tab cannot be found
+  // Stop if the IFW tab cannot be found
   if (!link) {
     return;
   }

build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js

@@ -514,7 +514,7 @@
           event.preventDefault();
         }
 
-        // Escape is the abort keystroke (for any target element)
+        // Escape is the cancel keystroke (for any target element)
         if (event.keyCode === KEYCODE.ESC && item) {
           item.setAttribute('draggable', 'false');
           item.setAttribute('aria-grabbed', 'false');
@@ -573,7 +573,7 @@
         switchRowPositions(item, row);
       });
 
-      // dragend event to clean-up after drop or abort
+      // dragend event to clean-up after drop or cancelation
       // which fires whether or not the drop target was valid
       this.addEventListener('dragend', () => {
         if (item) {

libraries/src/Application/CMSApplication.php

@@ -269,7 +269,7 @@ function ($systemVariable) use ($input) {
             $input->set($systemVariable, null);
         }
 
-        // Abort when there are invalid variables
+        // Stop when there are invalid variables
         if ($invalidInputVariables) {
             throw new \RuntimeException('Invalid input, aborting application.');
         }

libraries/src/Console/FinderIndexCommand.php

@@ -317,7 +317,7 @@ private function purge()
         // Attempt to purge the index.
         $return = $model->purge();
 
-        // If unsuccessful then abort.
+        // If unsuccessful then stop.
         if (!$return) {
             $message = Text::_('FINDER_CLI_INDEX_PURGE_FAILED', $model->getError());
             $this->ioStyle->error($message);

libraries/src/Dispatcher/AbstractModuleDispatcher.php

@@ -62,7 +62,7 @@ public function dispatch()
 
         $displayData = $this->getLayoutData();
 
-        // Abort when display data is false
+        // Stop when display data is false
         if ($displayData === false) {
             return;
         }
@@ -94,7 +94,7 @@ public function dispatch()
      * Returns the layout data. This function can be overridden by subclasses to add more
      * attributes for the layout.
      *
-     * If false is returned, then it means that the dispatch process should be aborted.
+     * If false is returned, then it means that the dispatch process should be stopped.
      *
      * @return  array|false
      *

libraries/src/Installer/Adapter/LibraryAdapter.php

@@ -59,7 +59,7 @@ protected function checkExtensionInFilesystem()
                 // From this point we'll consider this an update
                 $this->setRoute('update');
             } else {
-                // Abort the install, no upgrade possible
+                // Stop the install, no upgrade possible
                 throw new \RuntimeException(Text::_('JLIB_INSTALLER_ABORT_LIB_INSTALL_ALREADY_INSTALLED'));
             }
         }

libraries/src/Schema/ChangeSet.php

@@ -232,7 +232,7 @@ public function getSchema()
     {
         $updateFiles = $this->getUpdateFiles();
 
-        // No schema files found - abort and return empty string
+        // No schema files found - stop and return empty string
         if (empty($updateFiles)) {
             return '';
         }

libraries/src/Table/ContentType.php

@@ -145,7 +145,7 @@ public function getContentTable()
                 $class = $tableInfo->special->class ?? 'Joomla\\CMS\\Table\\Table';
 
                 if (!class_implements($class, 'Joomla\\CMS\\Table\\TableInterface')) {
-                    // This isn't an instance of TableInterface. Abort.
+                    // This isn't an instance of TableInterface. Stop.
                     throw new \RuntimeException('Class must be an instance of Joomla\\CMS\\Table\\TableInterface');
                 }
 

plugins/system/actionlogs/actionlogs.php

@@ -269,7 +269,7 @@ public function onAfterRespond()
             $result = false;
         }
 
-        // Abort on failure
+        // Stop on failure
         if (!$result) {
             return;
         }

plugins/system/logrotation/logrotation.php

@@ -118,7 +118,7 @@ public function onAfterRender()
             $result = false;
         }
 
-        // Abort on failure
+        // Stop on failure
         if (!$result) {
             return;
         }

plugins/system/privacyconsent/privacyconsent.php

@@ -526,7 +526,7 @@ public function onAfterRender()
             $result = false;
         }
 
-        // Abort on failure
+        // Stop on failure
         if (!$result) {
             return;
         }

plugins/system/updatenotification/updatenotification.php

@@ -139,7 +139,7 @@ public function onAfterRender()
             $result = false;
         }
 
-        // Abort on failure
+        // Stop on failure
         if (!$result) {
             return;
         }