mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9235 from nextcloud/12-9159 

[stable12] Use multibyte substring
This commit is contained in:
Roeland Jago Douma 2018-04-18 21:12:33 +02:00 committed by GitHub
parent f7d6eb9ab6 5c6f916009
commit c433b3cf66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/dav/lib/CalDAV/CalDavBackend.php
View File

@ -2029,7 +2029,7 @@ 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 = substr($value, 0, 254); $value = mb_substr($value, 0, 254);
$query->setParameter('name', $property->name); $query->setParameter('name', $property->name);
$query->setParameter('parameter', null); $query->setParameter('parameter', null);
@ -2047,7 +2047,7 @@ 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 = substr($value, 0, 254); $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', substr($key, 0, 254));