Changeset 26592 for extensions/community

Timestamp:

Jan 9, 2014, 10:26:21 PM (10 years ago)

Author:

plg

Message:

bug fixed: version_compare can't compare 2.5.c and 2.5.d. mistic has written a
new function safe_version_compare which correctly handles letters in version
numbers.

Location:

extensions/community

Files:

• include/functions_community.inc.php (modified) (1 diff)
• main.inc.php (modified) (1 diff)

extensions/community/include/functions_community.inc.php

@@ -396 +396 @@
   return pwg_db_fetch_assoc(pwg_query($query));
 }
+
+// will be included in Piwigo 2.6
+if (!function_exists('safe_version_compare'))
+{
+  function safe_version_compare($a, $b, $cmp=null)
+  {
+    $replace_chars = create_function('$m', 'return ord(strtolower($m[1]));');
+    $a = preg_replace('#([0-9]+)([a-z]+)#i', '$1.$2', $a);
+    $b = preg_replace('#([0-9]+)([a-z]+)#i', '$1.$2', $b);
+    $a = preg_replace_callback('#\b([a-z]{1})\b#i', $replace_chars, $a);
+    $b = preg_replace_callback('#\b([a-z]{1})\b#i', $replace_chars, $b);
+    if (empty($cmp))
+    {
+      return version_compare($a, $b);
+    }
+    else
+    {
+      return version_compare($a, $b, $cmp);
+    }
+  }
+}
 ?>

extensions/community/main.inc.php

@@ -44 +44 @@
     COMMUNITY_VERSION == 'auto' or
     $pwg_loaded_plugins[COMMUNITY_ID]['version'] == 'auto' or
-    version_compare($pwg_loaded_plugins[COMMUNITY_ID]['version'], COMMUNITY_VERSION, '<')
+    safe_version_compare($pwg_loaded_plugins[COMMUNITY_ID]['version'], COMMUNITY_VERSION, '<')
   )
   {