diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-02-25 14:49:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-25 14:49:14 +0100 |
| commit | e00c1dcd1111ec50b0db65af0171740c2eff8afc (patch) | |
| tree | c6139319d34ebd80895335500fbfa48fe3d2e0fc /apps | |
| parent | 0cf76aa2e8a66cd9b772be462fbb9b6633f32b32 (diff) | |
| parent | d224ee667e432d62ca29a88c56d64c9820e55a61 (diff) | |
| download | nextcloud-server-e00c1dcd1111ec50b0db65af0171740c2eff8afc.tar.gz nextcloud-server-e00c1dcd1111ec50b0db65af0171740c2eff8afc.zip | |
Merge pull request #19634 from nextcloud/bugfix/noid/long-cyrillic-note
Correctly trim long cyrillic note
Diffstat (limited to 'apps')
| -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(); } |