holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure line breaks (emails) get preserved when merging

Browse Source
This commit is contained in:
Nathan Gray 2011-04-18 18:54:11 +00:00
parent 61862bf50d
commit dd9d78d29a
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
infolog/inc/class.infolog_merge.inc.php
View File

@ -91,6 +91,17 @@ class infolog_merge extends bo_merge
{
$array['info_contact'] = $array['info_link']['title'];
}
// Make sure line breaks get preserved (Needed for emails in particular)
switch($this->mimetype)
{
case 'application/vnd.oasis.opendocument.text': // open office
case 'application/vnd.oasis.opendocument.spreadsheet':
case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document': // ms office 2007
case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
$record->info_des = nl2br($record->info_des);
}
// Set any missing custom fields, or the marker will stay
$array = $record->get_record_array();
foreach($this->bo->customfields as $name => $field)