Revert "Horde_Stream#getString() does not work the way I thought."

This reverts commit 05f0c89.
horde · Oct 1, 2013 · e389692 · e389692
1 parent 686096a
commit e389692
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php b/framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php
@@ -1015,7 +1015,7 @@ protected function _buildMailMessage(
         // Preview?
         if ($version >= Horde_ActiveSync::VERSION_FOURTEEN && !empty($options['bodyprefs']['preview'])) {
             $eas_message->airsyncbasebody->preview =
-                $message_body_data['plain']['body']->read($options['bodyprefs']['preview'], true);
+                $message_body_data['plain']['body']->getString(0, $options['bodyprefs']['preview']);
         }
 
         // Check for special message types.

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Rfc822.php b/framework/ActiveSync/lib/Horde/ActiveSync/Rfc822.php
@@ -105,7 +105,8 @@ public function getString()
      */
     public function getHeaders()
     {
-        $hdr_text = $this->_stream->read($this->_hdr_pos, true);
+        $this->_stream->rewind();
+        $hdr_text = $this->_stream->getString(null, $this->_hdr_pos);
         return Horde_Mime_Headers::parseHeaders($hdr_text);
     }