Pass stream into parsePGPData()

horde · Nov 7, 2013 · aeb151b · aeb151b
1 parent 1ef63fd
commit aeb151b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/imp/lib/Mime/Viewer/Plain.php b/imp/lib/Mime/Viewer/Plain.php
@@ -244,8 +244,12 @@ protected function _getEmbeddedMimeParts()
      */
     protected function _parsePGP()
     {
-        /* Avoid infinite loop. */
-        $parts = $GLOBALS['injector']->getInstance('IMP_Crypt_Pgp')->parsePGPData($this->_mimepart->getContents());
+        $parts = $GLOBALS['injector']->getInstance('IMP_Crypt_Pgp')->parsePGPData(
+            new Horde_Stream_Existing(array(
+                'stream' => $this->_mimepart->getContents(array('stream' => true))
+            ))
+        );
+
         if (empty($parts) ||
             ((count($parts) == 1) &&
              ($parts[0]['type'] == Horde_Crypt_Pgp::ARMOR_TEXT))) {

diff --git a/imp/package.xml b/imp/package.xml
@@ -1225,7 +1225,7 @@
    <package>
     <name>Horde_Crypt</name>
     <channel>pear.horde.org</channel>
-    <min>2.1.0</min>
+    <min>2.3.0</min>
     <max>3.0.0alpha1</max>
     <exclude>3.0.0alpha1</exclude>
    </package>