Skip to content

[4] Allow numeric client IDs in extension update XMLs #41462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MacJoom merged 3 commits into from
Sep 5, 2023
Merged

[4] Allow numeric client IDs in extension update XMLs #41462

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e77f484
allow numeric client ids in update server manifests
SniperSister Aug 26, 2023
841493a
Merge branch '4.4-dev' into 4.4-fixextensionadapteridhandling
MacJoom Aug 31, 2023
9112425
Merge branch '4.4-dev' into 4.4-fixextensionadapteridhandling
MacJoom Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion libraries/src/Updater/Adapter/ExtensionAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,14 @@ public function findUpdate($options)

if (isset($this->latest)) {
if (isset($this->latest->client) && \strlen($this->latest->client)) {
$this->latest->client_id = ApplicationHelper::getClientInfo($this->latest->client, true)->id;
/**
* The client_id in the update XML manifest can be either an integer (backwards
* compatible with Joomla 1.6–3.10) or a string. Backwards compatibility with the
* integer key is provided as update servers with the legacy, numeric IDs cause PHP notices
* during update retrieval. The proper string key is one of 'site' or 'administrator'.
*/
$this->latest->client_id = is_numeric($this->latest->client) ? $this->latest->client
: ApplicationHelper::getClientInfo($this->latest->client, true)->id;

unset($this->latest->client);
}
Expand Down