fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-04 01:01:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

Never mark core modules as needing update in autoinstall

Browse source
This commit is contained in:
Kijin Sung 2020-12-18 22:58:14 +09:00
parent aacc387d55
commit 0e0dce05a8
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/autoinstall/autoinstall.admin.controller.php
View file

@ -165,7 +165,7 @@ class autoinstallAdminController extends autoinstall
$args->package_srl = $package->package_srl;
$args->version = $package->version;
$args->current_version = $version;
if(version_compare($args->version, $args->current_version, ">"))
if($version !== 'RX_VERSION' && version_compare($args->version, $args->current_version, ">"))
{
$args->need_update = "Y";
}

8
modules/autoinstall/autoinstall.admin.model.php
View file

@ -314,7 +314,11 @@ class autoinstallAdminModel extends autoinstall
{
$package->depends[$key]->installed = TRUE;
$package->depends[$key]->cur_version = $packages[$dep->package_srl]->current_version;
if(version_compare($dep->version, $packages[$dep->package_srl]->current_version, ">"))
if($packages[$dep->package_srl]->current_version === 'RX_VERSION')
{
$package->need_update = FALSE;
}
elseif(version_compare($dep->version, $packages[$dep->package_srl]->current_version, ">"))
{
$package->depends[$key]->need_update = TRUE;
$package->package_srl .= "," . $dep->package_srl;
@ -332,7 +336,7 @@ class autoinstallAdminModel extends autoinstall
{
$package->installed = TRUE;
$package->cur_version = $installedPackage->current_version;
$package->need_update = version_compare($package->version, $installedPackage->current_version, ">");
$package->need_update = $installedPackage->current_version !== 'RX_VERSION' && version_compare($package->version, $installedPackage->current_version, ">");
}
if($package->path === '.')

6
modules/autoinstall/autoinstall.admin.view.php
View file

@ -211,7 +211,11 @@ class autoinstallAdminView extends autoinstall
$v->current_version = $packages[$v->package_srl]->current_version;
// if version is up
// insert Y
if(version_compare($v->item_version, $v->current_version, '>'))
if($v->current_version === 'RX_VERSION')
{
$v->need_update = 'N';
}
elseif(version_compare($v->item_version, $v->current_version, '>'))
{
$v->need_update = 'Y';
}