From 9b3ff8c255e61bdee161f75bac60ae2e80dfceeb Mon Sep 17 00:00:00 2001 From: Franziska Dyckhoff Date: Sun, 20 Aug 2017 12:01:17 +0200 Subject: [PATCH] fix utf-8 encoding of calendar response resolves #4 --- src/Response/CalendarResponse.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Response/CalendarResponse.php b/src/Response/CalendarResponse.php index 239c573..42dead3 100644 --- a/src/Response/CalendarResponse.php +++ b/src/Response/CalendarResponse.php @@ -31,7 +31,13 @@ class CalendarResponse extends Response public function __construct(Calendar $calendar, $status = 200, $headers = array()) { $this->calendar = $calendar; - $content = utf8_encode($calendar->createCalendar()); + + // convert to UTF-8 + $content = $calendar->createCalendar(); + if (!mb_check_encoding($content, 'UTF-8')) { + $content = utf8_encode($content); + } + $headers = array_merge($this->getDefaultHeaders(), $headers); parent::__construct($content, $status, $headers); }