Skip to content

Commit d224ee6

Browse files
committed
Correctly trim long cyrillic note
Signed-off-by: Joas Schilling <[email protected]>
1 parent 2e4ba61 commit d224ee6

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

apps/dav/lib/CalDAV/CalDavBackend.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2465,11 +2465,10 @@ public function updateProperties($calendarId, $objectUri, $calendarData, $calend
24652465
if ($this->db->supports4ByteText()) {
24662466
$value = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $value);
24672467
}
2468-
$value = mb_substr($value, 0, 254);
24692468

24702469
$query->setParameter('name', $property->name);
2471-
$query->setParameter('parameter', substr($key, 0, 254));
2472-
$query->setParameter('value', substr($value, 0, 254));
2470+
$query->setParameter('parameter', mb_substr($key, 0, 254));
2471+
$query->setParameter('value', mb_substr($value, 0, 254));
24732472
$query->execute();
24742473
}
24752474
}

apps/dav/lib/CardDAV/CardDavBackend.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1063,7 +1063,7 @@ protected function updateProperties($addressBookId, $cardUri, $vCardSerialized)
10631063
}
10641064
}
10651065
$query->setParameter('name', $property->name);
1066-
$query->setParameter('value', substr($property->getValue(), 0, 254));
1066+
$query->setParameter('value', mb_substr($property->getValue(), 0, 254));
10671067
$query->setParameter('preferred', $preferred);
10681068
$query->execute();
10691069
}

0 commit comments

Comments
 (0)