Merge remote-tracking branch 'refs/remotes/origin/master' into arindam-bug-priority

This commit is contained in:
Manish Verma
2016-11-04 18:23:31 +05:30
parent e4b9755294
commit 775e0561d8
2541 changed files with 59048 additions and 90348 deletions

View File

@@ -97,9 +97,8 @@ class Attachment
} elseif (isset($parameters['name'])) {
$this->filename = $parameters['name'];
}
if (isset($structure->bytes)) {
$this->size = $structure->bytes;
}
$this->size = $structure->bytes;
$this->mimeType = Message::typeIdToString($structure->type);