diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php index adbfcc3597..3e13adc888 100644 --- a/etemplate/inc/class.bo_merge.inc.php +++ b/etemplate/inc/class.bo_merge.inc.php @@ -306,7 +306,12 @@ abstract class bo_merge { $mimetype = 'application/rtf'; } - return $this->merge_string($content,$ids,$err,$mimetype,$fix); + try { + return $this->merge_string($content,$ids,$err,$mimetype,$fix); + } catch (Exception $e) { + $err = $e->getMessage(); + return false; + } } /**