Skip to content

Commit 618723d

Browse files
committed
Merge pull request #1 from zyspec/master
- fixed XOOPS version check on install
2 parents 0e3800a + 0548f66 commit 618723d

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

class/formtag.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ public function __construct($name, $size, $maxlength, $value = null, $catid = 0)
5454
}
5555
}
5656
$caption = _MD_TAG_TAGS;
57-
$this->XoopsFormText($caption, $name, $size, $maxlength, $value);
57+
// $this->XoopsFormText($caption, $name, $size, $maxlength, $value);
58+
parent::__construct($caption, $name, $size, $maxlength, $value);
5859
}
5960

6061
/**

docs/changelog.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
2.33 RC 1 NOT RELEASED
22
=================================
33
- added check for plugins in /class/plugins (in preparation for next version of XOOPS (mamba)
4+
- fixed XOOPS version check on install (zyspec)
5+
- fixed call to XoopsFormText in TagFormTag class (zyspec)
46

57
2.33 Beta 1 2014-12-05
68
=================================

include/action.module.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,23 @@ function xoops_module_pre_install_tag(&$module)
3737
$success = true;
3838
foreach ($reqArray as $k=>$v) {
3939
if (isset($currArray[$k])) {
40-
if ($currArray[$k] >= $v) {
40+
if ($currArray[$k] > $v) {
41+
break;
42+
} elseif ($currArray[$k] = $v) {
4143
continue;
4244
} else {
4345
$success = false;
4446
break;
4547
}
4648
} else {
47-
if ($v > 0) {
49+
if (intval($v) > 0) { // to handle things like x.x.x.0_RC1
4850
$success = false;
4951
break;
5052
}
5153
}
5254
}
5355
if (!$success) {
5456
$module->setErrors("This module requires XOOPS {$requiredVer}+ ({$currentVer} installed)");
55-
5657
return false;
5758
}
5859

0 commit comments

Comments
 (0)