diff --git a/addressbook/inc/class.addressbook_merge.inc.php b/addressbook/inc/class.addressbook_merge.inc.php index e1fb5c6e53..920b491af5 100644 --- a/addressbook/inc/class.addressbook_merge.inc.php +++ b/addressbook/inc/class.addressbook_merge.inc.php @@ -328,6 +328,10 @@ class addressbook_merge // extends bo_merge { $replacements = $GLOBALS['egw']->translation->convert($replacements,$GLOBALS['egw']->translation->charset(),$this->contacts->prefs['csv_charset']); } + if (substr($document,0,6) == 'zip://') // zip'ed xml document (eg. OO) --> need to encode &,<,> to not mess up xml + { + $replacements = str_replace(array('&','&','<','>'),array('&','&','<','>'),$replacements); + } $content = str_replace(array_keys($replacements),array_values($replacements),$content); if (strpos($content,'$$calendar/') !== null) // remove not existing event-replacements