Merge branch '2023.11' into 2024.11

Author: gitlabci

tine20/Tinebase/Helper.php

@@ -264,7 +264,10 @@ public static function in_array_case($_arr, $_str)
     public static function mbConvertTo($string, $encodingTo = 'utf-8')
     {
         // try to fix bad encodings
-        $encoding = mb_detect_encoding((string)$string, array('utf-8', 'iso-8859-1', 'iso-8859-15'));
+        $encoding = mb_detect_encoding((string)$string, 'UTF-8', true);
+        if ($encoding !== 'UTF-8') {
+            $encoding = mb_detect_encoding((string)$string, array('UTF-8', 'iso-8859-1', 'iso-8859-15'));
+        }
         if ($encoding !== FALSE) {
             $string = @mb_convert_encoding((string)$string, $encodingTo, $encoding);
         }

tine20/Tinebase/js/widgets/container/GrantsGrid.js

@@ -86,7 +86,7 @@ Tine.widgets.container.GrantsGrid = Ext.extend(Tine.widgets.account.PickerGridPa
             this.store = new Ext.data.JsonStore({
                 root: 'results',
                 totalProperty: 'totalcount',
-                id: 'account_id',
+                id: 'id',
                 fields: this.recordClass
             });
         }