diff --git a/workflow/engine/classes/class.spool.php b/workflow/engine/classes/class.spool.php index d5cc28a6d..bf67b5cec 100755 --- a/workflow/engine/classes/class.spool.php +++ b/workflow/engine/classes/class.spool.php @@ -138,7 +138,14 @@ class spoolRun */ public function create ($aData) { - $attachment = (is_array($aData['app_msg_attach'])) ? $aData['app_msg_attach'] : unserialize($aData['app_msg_attach']); + if (is_array($aData['app_msg_attach'])) { + $attachment = $aData['app_msg_attach']; + } else { + $attachment = @unserialize($aData['app_msg_attach']); + if ($attachment === false) { + $attachment = explode(',', $aData['app_msg_attach']); + } + } $aData['app_msg_attach'] = serialize($attachment); $aData['app_msg_show_message'] = (isset($aData['app_msg_show_message'])) ? $aData['app_msg_show_message'] : 1; $sUID = $this->db_insert( $aData ); @@ -182,7 +189,7 @@ class spoolRun $this->fileData['cc'] = $sCC; $this->fileData['bcc'] = $sBCC; $this->fileData['template'] = $sTemplate; - $this->fileData['attachments'] = is_string($aAttachment) ? $aAttachment : (is_array($aAttachment) ? $aAttachment : (($aAttachment != '') ? explode(',', $aAttachment) : array())); + $this->fileData['attachments'] = $aAttachment; $this->fileData['envelope_to'] = array (); $this->fileData["contentTypeIsHtml"] = $bContentTypeIsHtml; @@ -441,10 +448,9 @@ class spoolRun $oPHPMailer->Body = $msBody; - if (is_array($this->fileData['attachments'])) { + $attachment = @unserialize($this->fileData['attachments']); + if ($attachment === false) { $attachment = $this->fileData['attachments']; - } else { - $attachment = unserialize($this->fileData['attachments']); } if (is_array($attachment)) { foreach ($attachment as $key => $fileAttach) {