Changeset 27156 for trunk

Timestamp:

Feb 4, 2014, 11:56:44 AM (11 years ago)

Author:

mistic100

Message:

*Fatal error*: Call to undefined method plugins::plugin_version_compare
replaced by safe_version_compare
caused by r26998

Location:

trunk/admin

Files:

• include/updates.class.php (modified) (3 diffs)
• updates_ext.php (modified) (1 diff)

trunk/admin/include/updates.class.php

@@ -179 +179 @@
           $ext_info = $server_ext[$fs_ext['extension']];
 
-          if (!$this->version_compare($fs_ext['version'], $ext_info['revision_name'], $type))
+          if (!safe_version_compare($fs_ext['version'], $ext_info['revision_name'], '>='))
           {
             if (in_array($ext_id, $conf['updates_ignored'][$type]))
@@ -208 +208 @@
         {
           if (isset($_SESSION['extensions_need_update'][$type][$ext_id])
-            and $this->version_compare($fs_ext['version'], $_SESSION['extensions_need_update'][$type][$ext_id], $type))
+            and safe_version_compare($fs_ext['version'], $_SESSION['extensions_need_update'][$type][$ext_id], '>='))
           {
             // Extension have been upgraded
@@ -255 +255 @@
       }
     }
-  }
-
-  function version_compare($a, $b, $type)
-  {
-    $version_compare = rtrim($type, 's').'_version_compare';
-
-    return $this->$type->$version_compare($a, $b);
   }
 

trunk/admin/updates_ext.php

@@ -60 +60 @@
     $ext_info = $server_ext[$fs_ext['extension']];
 
-    if (!$autoupdate->version_compare($fs_ext['version'], $ext_info['revision_name'], $type))
+    if (!safe_version_compare($fs_ext['version'], $ext_info['revision_name'], '>='))
     {
       $template->append('update_'.$type, array(