wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #19637 from nextcloud/backport/19634/stable17

Browse source 
[stable17] Correctly trim long cyrillic note
This commit is contained in:
Roeland Jago Douma 2020-02-25 20:31:34 +01:00 committed by GitHub
commit 96011fad85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/dav/lib/CalDAV/CalDavBackend.php
View file

@ -2463,11 +2463,10 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
if ($this->db->supports4ByteText()) { if ($this->db->supports4ByteText()) {
$value = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $value); $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('name', $property->name);
$query->setParameter('parameter', substr($key, 0, 254)); $query->setParameter('parameter', mb_substr($key, 0, 254));
$query->setParameter('value', substr($value, 0, 254)); $query->setParameter('value', mb_substr($value, 0, 254));
$query->execute(); $query->execute();
} }
} }

2
apps/dav/lib/CardDAV/CardDavBackend.php
View file

@ -1061,7 +1061,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
} }
} }
$query->setParameter('name', $property->name); $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->setParameter('preferred', $preferred);
$query->execute(); $query->execute();
} }