Merge pull request #83 from mambax7/master

1.05 RC 4
XoopsModules25x · Nov 15, 2017 · 3f7751b · 3f7751b
2 parents beadb51 + 9368525
commit 3f7751b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 22 deletions.
diff --git a/class/utility.php b/class/utility.php
@@ -1380,33 +1380,16 @@ public static function checkVerXoops(XoopsModule $module = null, $requiredVer =
             $module = XoopsModule::getByDirname($moduleDirName);
         }
         xoops_loadLanguage('admin', $moduleDirName);
+
         //check for minimum XOOPS version
         $currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
-        $currArray  = explode('.', $currentVer);
         if (null === $requiredVer) {
             $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
         }
-        $reqArray = explode('.', $requiredVer);
-        $success  = true;
-        foreach ($reqArray as $k => $v) {
-            if (isset($currArray[$k])) {
-                if ($currArray[$k] > $v) {
-                    break;
-                } elseif ($currArray[$k] == $v) {
-                    continue;
-                } else {
-                    $success = false;
-                    break;
-                }
-            } else {
-                if ((int)$v > 0) { // handles versions like x.x.x.0_RC2
-                    $success = false;
-                    break;
-                }
-            }
-        }
+        $success     = true;
 
-        if (false === $success) {
+        if (version_compare($currentVer, $requiredVer, '<')){
+            $success     = false;
             $module->setErrors(sprintf(_AM_PUBLISHER_ERROR_BAD_XOOPS, $requiredVer, $currentVer));
         }
 

diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -1,6 +1,10 @@
-<h5>1.05 RC 4       [NOT RELEASED]</h5>
+<h5>1.05 RC 4       [2017-11-15]</h5>
 <hr>
 - fix breadcrumb for subcategories (bleekk)
+- change checkVerXoops(mamba)
+- fix confurator link (zyspec)
+- fix fmContent (zyspec)
+- fix archive (zyspec)
 
 <h5>1.05 RC 3       [2017-11-10]</h5>
 <hr>