Use Horde_Stream_Wrapper_Combine::getStream()

horde · Feb 4, 2014 · 8a4f3b0 · 8a4f3b0
1 parent e233cf3
commit 8a4f3b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/framework/Mail/lib/Horde/Mail/Transport/Smtphorde.php b/framework/Mail/lib/Horde/Mail/Transport/Smtphorde.php
@@ -122,14 +122,14 @@ public function send($recipients, array $headers, $body)
         list($from, $textHeaders) = $this->prepareHeaders($headers);
         $from = $this->_getFrom($from, $headers);
 
-        $swrapper = new Horde_Support_CombineStream(array(
+        $combine = Horde_String_Wrapper_Combine::getStream(array(
             rtrim($textHeaders, $this->sep),
             $this->sep . $this->sep,
             $body
         ));
 
         try {
-            $this->_smtp->send($from, $recipients, $swrapper->fopen(), array(
+            $this->_smtp->send($from, $recipients, $combine, array(
                 '8bit' => $this->send8bit
             ));
         } catch (Horde_Smtp_Exception $e) {

diff --git a/framework/Mail/package.xml b/framework/Mail/package.xml
@@ -115,9 +115,9 @@
     <exclude>2.0.0alpha1</exclude>
    </package>
    <package>
-    <name>Horde_Support</name>
+    <name>Horde_Stream_Wrapper</name>
     <channel>pear.horde.org</channel>
-    <min>2.0.0</min>
+    <min>2.1.0</min>
     <max>3.0.0alpha1</max>
     <exclude>3.0.0alpha1</exclude>
    </package>