[mms] Fixes for stream handling in the Nstring object.

horde · Mar 5, 2014 · 5d2025e · 5d2025e
1 parent d1012ef
commit 5d2025e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Data/Format/Nstring.php b/framework/Imap_Client/lib/Horde/Imap/Client/Data/Format/Nstring.php
@@ -52,6 +52,17 @@ public function escape()
             : parent::escape();
     }
 
+    public function escapeStream()
+    {
+        if (is_null($this->_data)) {
+            $stream = new Horde_Stream_Temp();
+            $stream->add('NIL', true);
+            return $stream->stream;
+        }
+
+        return parent::escapeStream();
+    }
+
     /**
      */
     public function quoted()
@@ -76,7 +87,7 @@ public function getStream()
     {
         return is_null($this->_data)
             ? new Horde_Stream_Temp()
-            : parent::length();
+            : parent::getStream();
     }
 
 }
diff --git a/framework/Imap_Client/package.xml b/framework/Imap_Client/package.xml
@@ -21,6 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
+* [mms] Fixes for stream handling in the Nstring object.
 * [mms] Split data format object test into individual files.
  </notes>
  <contents>
@@ -2280,6 +2281,7 @@
    <date>2014-03-05</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
+* [mms] Fixes for stream handling in the Nstring object.
 * [mms] Split data format object test into individual files.
    </notes>
   </release>