Skip to content

Commit 3087232

Browse files
committed
Merge remote-tracking branch 'upstream/5.3-dev' into 5.4-dev-upmerge-2025-03-26
2 parents ff111bf + f0eddc4 commit 3087232

File tree

3 files changed

+19
-4
lines changed

3 files changed

+19
-4
lines changed

administrator/components/com_admin/script.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2450,6 +2450,21 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
24502450
'/libraries/vendor/maximebf/debugbar/src/DebugBar/Storage/PdoStorage.php',
24512451
'/libraries/vendor/maximebf/debugbar/src/DebugBar/Storage/RedisStorage.php',
24522452
'/libraries/vendor/maximebf/debugbar/src/DebugBar/Storage/StorageInterface.php',
2453+
// From 5.3.0-beta3 to 5.3.0-rc1
2454+
'/libraries/vendor/joomla/http/.drone.jsonnet',
2455+
'/libraries/vendor/joomla/http/.drone.yml',
2456+
'/libraries/vendor/joomla/oauth1/.drone.jsonnet',
2457+
'/libraries/vendor/joomla/oauth1/.drone.yml',
2458+
'/libraries/vendor/joomla/oauth2/.drone.jsonnet',
2459+
'/libraries/vendor/joomla/oauth2/.drone.yml',
2460+
'/libraries/vendor/joomla/router/.drone.jsonnet',
2461+
'/libraries/vendor/joomla/router/.drone.yml',
2462+
'/libraries/vendor/joomla/string/.drone.jsonnet',
2463+
'/libraries/vendor/joomla/string/.drone.yml',
2464+
'/libraries/vendor/joomla/uri/.drone.jsonnet',
2465+
'/libraries/vendor/joomla/uri/.drone.yml',
2466+
'/libraries/vendor/joomla/utilities/.drone.jsonnet',
2467+
'/libraries/vendor/joomla/utilities/.drone.yml',
24532468
];
24542469

24552470
$folders = [

administrator/components/com_content/tmpl/articles/default.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@
321321
<?php echo $this->escape($item->access_level); ?>
322322
</td>
323323
<td class="small d-none d-md-table-cell">
324-
<?php if ((int) $item->created_by != 0) : ?>
324+
<?php if (!empty($item->author_name)) : ?>
325325
<a href="<?php echo Route::_('index.php?option=com_users&task=user.edit&id=' . (int) $item->created_by); ?>">
326326
<?php echo $this->escape($item->author_name); ?>
327327
</a>

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)