summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2018-04-11 15:55:55 +0200
committerGitHub <noreply@github.com>2018-04-11 15:55:55 +0200
commit2626d11f787a79934b36692fcaab58e9982ec7f7 (patch)
treea6e0e14f85f94fe59e00c04c1b8294b4a27c6725 /apps
parent88c1b8edbdc109a21435cd6434517b2c34cbb3e4 (diff)
parent0864d1c51de5d512b35fb2ebda5a792ba427f3f2 (diff)
downloadnextcloud-server-2626d11f787a79934b36692fcaab58e9982ec7f7.tar.gz
nextcloud-server-2626d11f787a79934b36692fcaab58e9982ec7f7.zip
Merge pull request #9097 from nextcloud/bugfix/7661/use_mb_substr
Use multibyte substring
Diffstat (limited to 'apps')
-rw-r--r--apps/dav/lib/CalDAV/CalDavBackend.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
index 290d6027006..b28c8534aaa 100644
--- a/apps/dav/lib/CalDAV/CalDavBackend.php
+++ b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -2251,7 +2251,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
if (!$this->db->supports4ByteText()) {
$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('parameter', null);
@@ -2269,7 +2269,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
if ($this->db->supports4ByteText()) {
$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('parameter', substr($key, 0, 254));