Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2184-list-manager-email-domain-filter

This commit is contained in:
aynsix
2020-04-22 13:58:02 +03:00
14 changed files with 742 additions and 814 deletions

View File

@@ -628,7 +628,7 @@ class PushController extends Controller
$manager->persist($validation);
$manager->flush();
$manager->commit();
$ret['message'] = $this->app->trans('Expiration date successfully updated!');
$ret['message'] = 'Expiration date successfully updated!';
} catch (\Exception $e) {
$ret['message'] = $e->getMessage();
$manager->rollback();