Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* finish task #1567

Browse Source
This commit is contained in:
wangyidong
2013-07-16 04:07:21 +00:00
parent b0056f8e82
commit 443dabf7ed
4 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/extension/control.php
+3 -3
View File
@@ -41,7 +41,7 @@ class extension extends control
$extension = $extensions[$release->code];
$extension->viewLink = $release->viewLink;
if(isset($release->latestRelease) and $extension->version != $release->latestRelease->releaseVersion and $this->extension->checkVersion($release->latestRelease->zentaoVersion))
if(isset($release->latestRelease) and $extension->version != $release->latestRelease->releaseVersion and $this->extension->checkVersion($release->latestRelease->zentaoCompatible))
{
$upgradeLink = inlink('upgrade', "extension=$release->code&downLink=" . helper::safe64Encode($release->latestRelease->downLink) . "&md5={$release->latestRelease->md5}&type=$release->type");
$upgradeLink = ($release->latestRelease->charge or !$release->latestRelease->public) ? $release->latestRelease->downLink : $upgradeLink;
@@ -254,8 +254,8 @@ class extension extends control
}
/* Check version compatible. */
$zentaoVersion = $condition->zentao['compatible'];
if(!$this->extension->checkVersion($zentaoVersion) and $ignoreCompatible == 'no')
$zentaoCompatible = $condition->zentao['compatible'];
if(!$this->extension->checkVersion($zentaoCompatible) and $ignoreCompatible == 'no')
{
$ignoreLink = inlink('install', "extension=$extension&downLink=$downLink&md5=$md5&type=$type&overridePackage=$overridePackage&ignoreCompatible=yes&overrideFile=$overrideFile&agreeLicense=$agreeLicense&upgrade=$upgrade");
$returnLink = inlink('obtain');