|
@@ -854,10 +854,8 @@ class message {
|
|
|
$hdr->disposition = (isset($arg_a[8+$s]) ? $arg_a[8+$s] : $hdr->disposition);
|
|
|
$hdr->language = (isset($arg_a[9+$s]) ? $arg_a[9+$s] : $hdr->language);
|
|
|
$msg->header = $hdr;
|
|
|
-// $arg_no = 0;
|
|
|
- ++$i;
|
|
|
- if ((substr($msg->entity_id, -2) == '.0') && ($msg->type0 !='multipart')) {
|
|
|
- $msg->entity_id++;
|
|
|
+ if ((strrchr($msg->entity_id, '.') == '.0') && ($msg->type0 !='multipart')) {
|
|
|
+ $msg->entity_id = $this->entity_id . '.1';
|
|
|
}
|
|
|
} else {
|
|
|
$hdr->type0 = 'multipart';
|
|
@@ -868,8 +866,8 @@ class message {
|
|
|
$hdr->disposition = (isset($arg_a[2]) ? $arg_a[2] : $hdr->disposition);
|
|
|
$hdr->language = (isset($arg_a[3]) ? $arg_a[3] : $hdr->language);
|
|
|
$msg->header = $hdr;
|
|
|
- ++$i;
|
|
|
}
|
|
|
+ ++$i;
|
|
|
return (array($msg, $i));
|
|
|
default: break;
|
|
|
} /* switch */
|