Branch 'kolab-webadmin-3.1' - lib/kolab_api_service.php

Aleksander Machniak machniak at kolabsys.com
Fri Mar 27 08:53:56 CET 2015


 lib/kolab_api_service.php |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit de82f0ccedc7be62d14377ce04f44d38c5adfb61
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Fri Mar 27 03:53:47 2015 -0400

    Fix object type scoring mechanism issue with locales that use non-standard decimal separator, i.e. a comma (#4799)
    
    Conflicts:
    
    	lib/kolab_api_service.php

diff --git a/lib/kolab_api_service.php b/lib/kolab_api_service.php
index 858e643..d0d4f26 100644
--- a/lib/kolab_api_service.php
+++ b/lib/kolab_api_service.php
@@ -201,6 +201,9 @@ abstract class kolab_api_service
 
             $elem_score .= ':' . $elem_keys_score . ':' . $elem_values_score;
 
+            // fix decimal separator for score_compare() and consistent log (#4799)
+            $elem_score = str_replace(',', '.', $elem_score);
+
 //            Log::trace("\$object_class not in \$ref_class (" . $elem['key'] . "): " . implode(", ", $_object_class));
 //            Log::trace("\$ref_class not in \$object_class (" . $elem['key'] . "): " . implode(", ", $_ref_class));
             Log::trace("Score for $object_name type " . $elem['name'] . ": " . $elem_score . " (" . $commonalities . "/" . $differences . ")");




More information about the commits mailing list