diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-02-25 20:31:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-25 20:31:09 +0100 |
| commit | 0b71df0ed0335d0b81196bd4775d23c535aa6740 (patch) | |
| tree | 9846e788ae71c1072fd605293988792b59909358 /apps | |
| parent | 4790564cd1ec99413e56d4ca477118ba1d43c776 (diff) | |
| parent | 396af5a234750658abbcfa56ab24784c2bfcd98a (diff) | |
| download | nextcloud-server-0b71df0ed0335d0b81196bd4775d23c535aa6740.tar.gz nextcloud-server-0b71df0ed0335d0b81196bd4775d23c535aa6740.zip | |
Merge pull request #19636 from nextcloud/backport/19634/stable18
[stable18] 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(); } |