Skip to content

Commit e92cc6b

Browse files
committed
Merge branch '4.3-dev' into 4.4-dev
2 parents 06393cd + a8be6ef commit e92cc6b

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
// phpcs:enable PSR1.Files.SideEffects
1919

2020
/**
21-
* ComponentDispatcher class for com_admin
21+
* ComponentDispatcher class for com_actionlogs
2222
*
2323
* @since 4.2.7
2424
*/
2525
class Dispatcher extends ComponentDispatcher
2626
{
2727
/**
28-
* com_admin does not require check permission, so we override checkAccess method and have it empty
28+
* Method to check component access permission
2929
*
3030
* @return void
3131
*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
// phpcs:enable PSR1.Files.SideEffects
2222

2323
/**
24-
* Field to load a list of all users that have logged actions
24+
* Field to load a list of all extensions that have logged actions
2525
*
2626
* @since 3.9.0
2727
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
// phpcs:enable PSR1.Files.SideEffects
1919

2020
/**
21-
* ComponentDispatcher class for com_admin
21+
* ComponentDispatcher class for com_joomlaupdate
2222
*
2323
* @since 4.0.0
2424
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export default {
7777
}
7878
7979
return this.item.thumb_path.split(Joomla.getOptions('system.paths').rootFull).length > 1
80-
? `${this.item.thumb_path}?${api.mediaVersion}`
80+
? `${this.item.thumb_path}?${this.item.modified_date ? new Date(this.item.modified_date).valueOf() : api.mediaVersion}`
8181
: `${this.item.thumb_path}`;
8282
},
8383
width() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
abstract class LatestActionsHelper
2828
{
2929
/**
30-
* Get a list of articles.
30+
* Get a list of logged actions.
3131
*
3232
* @param Registry &$params The module parameters.
3333
*

0 commit comments

Comments
 (0)