diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-05-23 13:43:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-23 13:43:56 +0200 |
| commit | 7593fa3464e79ffe1e629c5071b6a17b3703f74c (patch) | |
| tree | f5658ba0c8bad7e3942b0fdf97afa079d9d1789a | |
| parent | 446559979ca150fca9eecf7263c52b5e1f9ffb2e (diff) | |
| parent | f75b56fc5d9e2dc97d858ee5a0305eb05779910e (diff) | |
| download | nextcloud-server-7593fa3464e79ffe1e629c5071b6a17b3703f74c.tar.gz nextcloud-server-7593fa3464e79ffe1e629c5071b6a17b3703f74c.zip | |
Merge pull request #5005 from nextcloud/bugfix-stable12/fix_replacing_4mbunicode_for_calendar_properties_table
[stable12] fix replacing of 4MB Unicode Chars in cal props table
| -rw-r--r-- | apps/dav/lib/CalDAV/CalDavBackend.php | 2 | ||||
| -rw-r--r-- | apps/dav/tests/unit/CalDAV/CalDavBackendTest.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index fcf73cb0f31..ef3df8de83e 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -2009,7 +2009,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription if (in_array($property->name, self::$indexProperties)) { $value = $property->getValue(); // is this a shitty db? - if ($this->db->supports4ByteText()) { + if (!$this->db->supports4ByteText()) { $value = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $value); } $value = substr($value, 0, 254); diff --git a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php index dc531b5a64a..fa298282d7e 100644 --- a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php +++ b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php @@ -539,7 +539,7 @@ CREATED;VALUE=DATE-TIME:20130910T125139Z UID:47d15e3ec8 LAST-MODIFIED;VALUE=DATE-TIME:20130910T125139Z DTSTAMP;VALUE=DATE-TIME:20130910T125139Z -SUMMARY:123 Event +SUMMARY:123 Event 🙈 DTSTART;VALUE=DATE-TIME:20130912T130000Z DTEND;VALUE=DATE-TIME:20130912T140000Z ATTENDEE;CN=test:mailto:foo@bar.com |