Skip to content

Improve hasUpdate checks and make sure we don't offer updates to outdated versions #25810

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
HLeithner merged 7 commits into from
Aug 23, 2019
Merged

Improve hasUpdate checks and make sure we don't offer updates to outdated versions #25810

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5763090
imprive hasUpdate check
zero-24 Aug 10, 2019
f8c5eda
make sure outdated versions are not shown
zero-24 Aug 10, 2019
535a384
move the inline comments
zero-24 Aug 10, 2019
fe34654
use the operator thanks @mbabker
zero-24 Aug 11, 2019
a5f0ef2
typo
zero-24 Aug 11, 2019
e3cc50c
Update administrator/components/com_joomlaupdate/models/default.php
zero-24 Aug 12, 2019
dcf8c97
Merge branch 'staging' into improveHasUpdate
zero-24 Aug 12, 2019
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
19 changes: 17 additions & 2 deletions administrator/components/com_joomlaupdate/models/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +164,28 @@ public function getUpdateInformation()

if (is_null($updateObject))
{
// We have not found any update in the database we seem to run the latest version
$ret['latest'] = JVERSION;

return $ret;
}

$ret['latest'] = $updateObject->version;
$ret['hasUpdate'] = $updateObject->version != JVERSION;
// Check whether this is a valid update or not
if (version_compare($updateObject->version, JVERSION, '<'))
{
// This update points to an outdated version we should not offer to update to this
$ret['latest'] = JVERSION;

return $ret;
}

$ret['latest'] = $updateObject->version;

// Check whether this is an update or not.
if (version_compare($updateObject->version, JVERSION, '>'))
{
$ret['hasUpdate'] = true;
}

// Fetch the full update details from the update details URL.
jimport('joomla.updater.update');
Expand Down