porting PHRAS-1589 to 4.1

This commit is contained in:
Mike Ng
2017-12-22 16:04:02 +04:00
parent 0d7c2bd52d
commit 1aa919cc08
10 changed files with 45 additions and 24 deletions

View File

@@ -168,11 +168,11 @@ class ExportController extends Controller
$request->request->get('businessfields')
);
$separator = preg_split('//', ' ;,', -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
$separator = '/\\' . implode('|\\', $separator) . '/';
$list['export_name'] = sprintf("%s.zip", $download->getExportName());
$list['email'] = implode(';', preg_split($separator, $request->request->get("destmail", "")));
$separator = '/\ |\;|\,/';
// add PREG_SPLIT_NO_EMPTY to only return non-empty values
$list['email'] = implode(';', preg_split($separator, $request->request->get("destmail", ""), -1, PREG_SPLIT_NO_EMPTY));
$destMails = [];
//get destination mails