Support vCards which have the official mime type "text/directory".

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4585 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index 41abf6d5114df6083b77a2afb4677d9406eef883..1ebd135dd64dec5e68ef7234d6d197f75aabace3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,7 +9,7 @@ Version 1.4.0 CVS
   - Fixed the newmail plugin.
   - Added RECENT response to sqimap_get_status.
   - Fixed attachment filename resolving.
-  - Added check for X-Confirm-Reading-To to make MDN work messages send by Pine.
+  - Added check for X-Confirm-Reading-To to make MDN work for messages sent by Pine.
   - sqextractGlobalVar removed (use sqgetGlobalVar instead).
   - Subfolders of Sent and Drafts show To field instead of From
   - Updates in conf.pl to infamous delete_folder setting, including
@@ -35,6 +35,7 @@ Version 1.4.0 CVS
   - Allow encoded personal names in compose.php.
   - Improved address parsing from addresses coming from the compose form.
   - Fixed uninitialized indices when parsing attachments.
+  - Support text/directory MIME-type for vCards (RFC 2425).
 
 Version 1.4.0 RC 2a
 -------------------

diff --git a/functions/attachment_common.php b/functions/attachment_common.php
index 22b0026d891b3f22de704c7b8cad253344ac3f9c..7d61692555f29a9e299e0db43ea054990c1f4000 100644 (file)
--- a/functions/attachment_common.php
+++ b/functions/attachment_common.php
@@ -61,6 +61,7 @@ register_attachment_common('text/html',      'link_html');
 
 /* Register vcards */
 register_attachment_common('text/x-vcard',   'link_vcard');
+register_attachment_common('text/directory', 'link_vcard');
 
 /* Register rules for general types.
  * These will be used if there isn't a more specific rule available. */