Correctly trim long cyrillic note

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
index 62d3909ce39117a92540e8369437fe92da50d1f5..bb2a38fe232fec98c8cb74d7bd1fa270f6e77d72 100644 (file)
--- a/apps/dav/lib/CalDAV/CalDavBackend.php
+++ b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -2463,11 +2463,10 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
                                                        if ($this->db->supports4ByteText()) {
                                                                $value = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $value);
                                                        }
-                                                       $value = mb_substr($value, 0, 254);
 
                                                        $query->setParameter('name', $property->name);
-                                                       $query->setParameter('parameter', substr($key, 0, 254));
-                                                       $query->setParameter('value', substr($value, 0, 254));
+                                                       $query->setParameter('parameter', mb_substr($key, 0, 254));
+                                                       $query->setParameter('value', mb_substr($value, 0, 254));
                                                        $query->execute();
                                                }
                                        }

diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php
index 7dbd41a69c8cf7e143eeb4ef65a4901b94fe3cdc..eaedf638cb61405e39cd08a690a9ef8d3073c513 100644 (file)
--- a/apps/dav/lib/CardDAV/CardDavBackend.php
+++ b/apps/dav/lib/CardDAV/CardDavBackend.php
@@ -1061,7 +1061,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
                                }
                        }
                        $query->setParameter('name', $property->name);
-                       $query->setParameter('value', substr($property->getValue(), 0, 254));
+                       $query->setParameter('value', mb_substr($property->getValue(), 0, 254));
                        $query->setParameter('preferred', $preferred);
                        $query->execute();
                }