diff options
| author | Joas Schilling <coding@schilljs.com> | 2020-02-25 09:44:58 +0100 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2020-02-25 11:17:02 +0100 |
| commit | d224ee667e432d62ca29a88c56d64c9820e55a61 (patch) | |
| tree | 2dc628ab246fcf12fb4a22e9235fe57364d17ced /apps/dav | |
| parent | 2e4ba613ef8146110319d0b03a8e9a60a211752b (diff) | |
| download | nextcloud-server-d224ee667e432d62ca29a88c56d64c9820e55a61.tar.gz nextcloud-server-d224ee667e432d62ca29a88c56d64c9820e55a61.zip | |
Correctly trim long cyrillic note
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps/dav')
| -rw-r--r-- | apps/dav/lib/CalDAV/CalDavBackend.php | 5 | ||||
| -rw-r--r-- | 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 237c604f661..37dbb3c3f5d 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -2465,11 +2465,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 7ade5b7959c..24b91f7cec3 100644 --- a/apps/dav/lib/CardDAV/CardDavBackend.php +++ b/apps/dav/lib/CardDAV/CardDavBackend.php @@ -1063,7 +1063,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(); } |