Add missing parameter, wrap.

horde · Sep 28, 2016 · 6d2662a · 6d2662a
1 parent a2a038b
commit 6d2662a
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php b/framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php
@@ -1062,17 +1062,26 @@ protected function _buildMailMessage(
 
         // Fill in other header data
         try {
-            $eas_message->from = Horde_ActiveSync_Utils::ensureUtf8($imap_message->getFromAddress(), 'UTF-8');
+            $eas_message->from = Horde_ActiveSync_Utils::ensureUtf8(
+                $imap_message->getFromAddress(),
+                'UTF-8'
+            );
         } catch (Horde_ActiveSync_Exception $e) {
             $this->_logger->err($e->getMessage());
         }
         try {
-            $eas_message->cc = Horde_ActiveSync_Utils::ensureUtf8($imap_message->getCc());
+            $eas_message->cc = Horde_ActiveSync_Utils::ensureUtf8(
+                $imap_message->getCc(),
+                'UTF-8'
+            );
         } catch (Horde_ActiveSync_Exception $e) {
             $this->_logger->err($e->getMessage());
         }
         try {
-            $eas_message->reply_to = Horde_ActiveSync_Utils::ensureUtf8($imap_message->getReplyTo());
+            $eas_message->reply_to = Horde_ActiveSync_Utils::ensureUtf8(
+                $imap_message->getReplyTo(),
+                'UTF-8'
+            );
         } catch (Horde_ActiveSync_Exception $e) {
             $this->_logger->err($e->getMessage());
         }
@@ -1317,7 +1326,10 @@ protected function _buildMailMessage(
         if ($version >= Horde_ActiveSync::VERSION_TWELVE) {
             $eas_message->contentclass = 'urn:content-classes:message';
             if ($mime_part = $imap_message->hasiCalendar()) {
-                $data = Horde_ActiveSync_Utils::ensureUtf8($mime_part->getContents(), $mime_part->getCharset());
+                $data = Horde_ActiveSync_Utils::ensureUtf8(
+                    $mime_part->getContents(),
+                    $mime_part->getCharset()
+                );
                 $vCal = new Horde_Icalendar();
                 if ($vCal->parsevCalendar($data, 'VCALENDAR', $mime_part->getCharset())) {
                     $classes = $vCal->getComponentClasses();