From ae657f2b260c9087ab972ca695a35337546148a7 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 7 Jul 2009 10:12:31 +0000 Subject: [PATCH] "handling text/rtf as rtf" --- addressbook/inc/class.addressbook_merge.inc.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addressbook/inc/class.addressbook_merge.inc.php b/addressbook/inc/class.addressbook_merge.inc.php index e79c3b4ae8..e7267f1b65 100644 --- a/addressbook/inc/class.addressbook_merge.inc.php +++ b/addressbook/inc/class.addressbook_merge.inc.php @@ -51,6 +51,7 @@ class addressbook_merge // extends bo_merge case 'application/msword': if (strtolower($extension) != '.rtf') break; case 'application/rtf': + case 'text/rtf': return true; // rtf files case 'application/vnd.oasis.opendocument.text': if (!check_load_extension('zip')) break; @@ -338,6 +339,7 @@ class addressbook_merge // extends bo_merge case 'application/msword': if (strtolower(substr($document,-4)) != '.rtf') break; // no binary word documents case 'application/rtf': + case 'text/rtf': return $contentstart.implode('\\par \\page\\pard\\plain',$contentrepeatpages).$contentend; case 'application/vnd.oasis.opendocument.text': // todo OO writer files @@ -358,6 +360,7 @@ class addressbook_merge // extends bo_merge case 'application/msword': if (strtolower(substr($document,-4)) != '.rtf') break; // no binary word documents case 'application/rtf': + case 'text/rtf': return $contentstart.implode('\\par \\page\\pard\\plain',$contentrep).$contentend; case 'application/vnd.oasis.opendocument.text': // todo OO writer files