Skip to content

Commit 37cb401

Browse files
authored
Merge branch '5.2-dev' into 5.2-dev-upmerge-2024-12-19
2 parents ec32902 + eb04630 commit 37cb401

File tree

9 files changed

+19
-8
lines changed

9 files changed

+19
-8
lines changed

libraries/src/Installer/Adapter/ComponentAdapter.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1360,6 +1360,7 @@ public function refreshManifestCache()
13601360
$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
13611361
$this->parent->extension->manifest_cache = json_encode($manifest_details);
13621362
$this->parent->extension->name = $manifest_details['name'];
1363+
$this->parent->extension->changelogurl = $manifest_details['changelogurl'];
13631364

13641365
// Namespace is optional
13651366
if (isset($manifest_details['namespace'])) {

libraries/src/Installer/Adapter/FileAdapter.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,7 @@ public function refreshManifestCache()
583583
$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
584584
$this->parent->extension->manifest_cache = json_encode($manifest_details);
585585
$this->parent->extension->name = $manifest_details['name'];
586+
$this->parent->extension->changelogurl = $manifest_details['changelogurl'];
586587

587588
try {
588589
return $this->parent->extension->store();

libraries/src/Installer/Adapter/LanguageAdapter.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -734,9 +734,11 @@ public function refreshManifestCache()
734734

735735
$this->parent->manifest = $this->parent->isManifest($manifestPath);
736736
$this->parent->setPath('manifest', $manifestPath);
737+
737738
$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
738739
$this->parent->extension->manifest_cache = json_encode($manifest_details);
739740
$this->parent->extension->name = $manifest_details['name'];
741+
$this->parent->extension->changelogurl = $manifest_details['changelogurl'];
740742

741743
if ($this->parent->extension->store()) {
742744
return true;

libraries/src/Installer/Adapter/LibraryAdapter.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,7 @@ public function refreshManifestCache()
494494
$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
495495
$this->parent->extension->manifest_cache = json_encode($manifest_details);
496496
$this->parent->extension->name = $manifest_details['name'];
497+
$this->parent->extension->changelogurl = $manifest_details['changelogurl'];
497498

498499
try {
499500
return $this->parent->extension->store();

libraries/src/Installer/Adapter/ModuleAdapter.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,9 +415,11 @@ public function refreshManifestCache()
415415
$manifestPath = $client->path . '/modules/' . $this->parent->extension->element . '/' . $this->parent->extension->element . '.xml';
416416
$this->parent->manifest = $this->parent->isManifest($manifestPath);
417417
$this->parent->setPath('manifest', $manifestPath);
418+
418419
$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
419420
$this->parent->extension->manifest_cache = json_encode($manifest_details);
420421
$this->parent->extension->name = $manifest_details['name'];
422+
$this->parent->extension->changelogurl = $manifest_details['changelogurl'];
421423

422424
if ($this->parent->extension->store()) {
423425
return true;

libraries/src/Installer/Adapter/PackageAdapter.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,7 @@ public function refreshManifestCache()
717717
$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
718718
$this->parent->extension->manifest_cache = json_encode($manifest_details);
719719
$this->parent->extension->name = $manifest_details['name'];
720+
$this->parent->extension->changelogurl = $manifest_details['changelogurl'];
720721

721722
try {
722723
return $this->parent->extension->store();

libraries/src/Installer/Adapter/PluginAdapter.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -611,10 +611,11 @@ public function refreshManifestCache()
611611
. $this->parent->extension->element . '.xml';
612612
$this->parent->manifest = $this->parent->isManifest($manifestPath);
613613
$this->parent->setPath('manifest', $manifestPath);
614+
614615
$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
615616
$this->parent->extension->manifest_cache = json_encode($manifest_details);
616-
617-
$this->parent->extension->name = $manifest_details['name'];
617+
$this->parent->extension->name = $manifest_details['name'];
618+
$this->parent->extension->changelogurl = $manifest_details['changelogurl'];
618619

619620
if ($this->parent->extension->store()) {
620621
return true;

libraries/src/Installer/Adapter/TemplateAdapter.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -677,6 +677,7 @@ public function refreshManifestCache()
677677
$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
678678
$this->parent->extension->manifest_cache = json_encode($manifest_details);
679679
$this->parent->extension->name = $manifest_details['name'];
680+
$this->parent->extension->changelogurl = $manifest_details['changelogurl'];
680681

681682
try {
682683
return $this->parent->extension->store();

libraries/src/Installer/Installer.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2311,12 +2311,13 @@ public static function parseXMLInstallFile($path)
23112311
$data['creationDate'] = ((string) $xml->creationDate) ?: Text::_('JLIB_UNKNOWN');
23122312
$data['author'] = ((string) $xml->author) ?: Text::_('JLIB_UNKNOWN');
23132313

2314-
$data['copyright'] = (string) $xml->copyright;
2315-
$data['authorEmail'] = (string) $xml->authorEmail;
2316-
$data['authorUrl'] = (string) $xml->authorUrl;
2317-
$data['version'] = (string) $xml->version;
2318-
$data['description'] = (string) $xml->description;
2319-
$data['group'] = (string) $xml->group;
2314+
$data['copyright'] = (string) $xml->copyright;
2315+
$data['authorEmail'] = (string) $xml->authorEmail;
2316+
$data['authorUrl'] = (string) $xml->authorUrl;
2317+
$data['version'] = (string) $xml->version;
2318+
$data['description'] = (string) $xml->description;
2319+
$data['group'] = (string) $xml->group;
2320+
$data['changelogurl'] = (string) $xml->changelogurl;
23202321

23212322
// Child template specific fields.
23222323
if (isset($xml->inheritable)) {

0 commit comments

Comments
 (0)