Skip to content

Commit 3bd27c4

Browse files
authored
Display the correct changelog when updating (#44652)
1 parent f30b2cc commit 3bd27c4

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,16 @@ public function loadChangelog($eid, $source)
408408
]
409409
)
410410
)
411-
->select($db->quoteName('updates.version', 'updateVersion'))
411+
->select($db->quoteName(
412+
[
413+
'updates.version',
414+
'updates.changelogurl',
415+
],
416+
[
417+
'updateVersion',
418+
'updateChangelogUrl',
419+
]
420+
))
412421
->from($db->quoteName('#__extensions', 'extensions'))
413422
->join(
414423
'LEFT',
@@ -423,13 +432,15 @@ public function loadChangelog($eid, $source)
423432
$this->translate($extensions);
424433
$extension = array_shift($extensions);
425434

426-
if (!$extension->changelogurl) {
435+
$changelogurl = $source === 'manage' ? $extension->changelogurl : $extension->updateChangelogUrl;
436+
437+
if (!$changelogurl) {
427438
return '';
428439
}
429440

430441
$changelog = new Changelog();
431442
$changelog->setVersion($source === 'manage' ? $extension->version : $extension->updateVersion);
432-
$changelog->loadFromXml($extension->changelogurl);
443+
$changelog->loadFromXml($changelogurl);
433444

434445
// Read all the entries
435446
$entries = [

0 commit comments

Comments
 (0)