Skip to content
Snippets Groups Projects
Unverified Commit 77a2eda2 authored by Peter Rotich's avatar Peter Rotich Committed by GitHub
Browse files

Merge pull request #5133 from JediKev/issue/attachment-filter

issue: Attachment Filter
parents 88f605cf 9f4fbc27
No related branches found
No related tags found
No related merge requests found
...@@ -91,7 +91,9 @@ class TicketApiController extends ApiController { ...@@ -91,7 +91,9 @@ class TicketApiController extends ApiController {
$file['id'] = $F->getId(); $file['id'] = $F->getId();
} }
catch (FileUploadError $ex) { catch (FileUploadError $ex) {
$file['error'] = $file['name'] . ': ' . $ex->getMessage(); $name = $file['name'];
$file = array();
$file['error'] = $name . ': ' . $ex->getMessage();
} }
} }
unset($file); unset($file);
......
...@@ -845,7 +845,9 @@ class MailFetcher { ...@@ -845,7 +845,9 @@ class MailFetcher {
$file['id'] = $f->getId(); $file['id'] = $f->getId();
} }
catch (FileUploadError $ex) { catch (FileUploadError $ex) {
$file['error'] = $file['name'] . ': ' . $ex->getMessage(); $name = $file['name'];
$file = array();
$file['error'] = $name . ': ' . $ex->getMessage();
} }
$vars['attachments'][] = $file; $vars['attachments'][] = $file;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment