[jan] Fix using non-deprecated Content-Type for encrypted messages (B…

…ug #13659).
horde · Nov 3, 2014 · 2ac3886 · 2ac3886
1 parent aa028bc
commit 2ac3886
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/framework/Crypt/lib/Horde/Crypt/Smime.php b/framework/Crypt/lib/Horde/Crypt/Smime.php
@@ -287,7 +287,7 @@ protected function _encryptMessage($text, $params)
             if (openssl_pkcs7_encrypt($input, $output, $params['pubkey'], array(), 0, $val)) {
                 $result = file_get_contents($output);
                 if (!empty($result)) {
-                    return $this->_fixContentType($result, 'encrypt');
+                    return $this->_fixContentType($result, 'message');
                 }
             }
         }

diff --git a/framework/Crypt/package.xml b/framework/Crypt/package.xml
@@ -27,7 +27,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* 
+* [jan] Fix using non-deprecated Content-Type for encrypted messages (Bug #13659).
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -1037,7 +1037,7 @@ Initial release as a PEAR package
    <date>2014-10-21</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* 
+* [jan] Fix using non-deprecated Content-Type for encrypted messages (Bug #13659).
    </notes>
   </release>
  </changelog>