From 656f4fd8391a72226649ee189d7c728b34d0b8fa Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 25 Feb 2020 09:44:58 +0100 Subject: [PATCH] Correctly trim long cyrillic note Signed-off-by: Joas Schilling --- apps/dav/lib/CalDAV/CalDavBackend.php | 5 ++--- apps/dav/lib/CardDAV/CardDavBackend.php | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index 1589b8b010..47d701fdaa 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -2464,11 +2464,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 f30a12bba4..af439bd878 100644 --- a/apps/dav/lib/CardDAV/CardDavBackend.php +++ b/apps/dav/lib/CardDAV/CardDavBackend.php @@ -1055,7 +1055,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(); }