Revert "Another additional tweak to PGP parsing"

This reverts commit 5574680. We always need the line to be stripped of newline characters
horde · Jan 28, 2014 · ce51950 · ce51950
1 parent e17cd55
commit ce51950
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/framework/Crypt/lib/Horde/Crypt/Pgp/Parse.php b/framework/Crypt/lib/Horde/Crypt/Pgp/Parse.php
@@ -106,9 +106,8 @@ public function parse($text)
         }
 
         while (!$stream->eof()) {
-            $val = $stream->getToChar("\n", false);
+            $val = rtrim($stream->getToChar("\n", false), "\r");
             if ((strpos($val, '-----') === 0) &&
-                ($val = rtrim($val, "\r")) &&
                 preg_match('/^-----(BEGIN|END) PGP ([^-]+)-----\s*$/', $val, $matches)) {
                 if (isset($temp['data'])) {
                     $data[] = $temp;