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

* finish task #1566.

Browse Source
This commit is contained in:
wangyidong
2013-07-16 01:47:14 +00:00
parent a0dafb6d5a
commit 2baf6f43f5
2 changed files with 24 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/extension/control.php
+11 -7
View File
@@ -198,8 +198,7 @@ class extension extends control
if($conflicts)
{
$conflictsExt = '';
$limits = $this->extension->parseCondition($conflicts);
foreach($limits as $code => $limit)
foreach($conflicts as $code => $limit)
{
$hasConflicts = false;
if(isset($installedExts[$code]))
@@ -222,8 +221,7 @@ class extension extends control
if($depends)
{
$dependsExt = '';
$limits = $this->extension->parseCondition($depends);
foreach($limits as $code => $limit)
foreach($depends as $code => $limit)
{
$noDepends = false;
if(isset($installedExts[$code]))
@@ -236,9 +234,15 @@ class extension extends control
}
$extVersion = '';
if($limit['min'] == 'all') $extVersion = 'all';
if($limit['min'] and $limit['min']!= 'all') $extVersion .= '>=V' . $limit['min'];
if($limit['max']) $extVersion .= ' <=V' . $limit['max'];
if($limit == 'all')
{
$extVersion = 'all';
}
else
{
if(!empty($limit['min'])) $extVersion .= '>=V' . $limit['min'];
if(!empty($limit['max'])) $extVersion .= ' <=V' . $limit['max'];
}
if($noDepends)$dependsExt .= $code . "($extVersion) ";
}