Merge branch '3' into 4

This commit is contained in:
Daniel Hensby 2017-07-15 16:21:51 +01:00
commit 732bdd2734
No known key found for this signature in database
GPG Key ID: 5DE415D786BBB2FD

View File

@ -1189,7 +1189,16 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
// TODO Can't merge $FormAttributes in template at the moment
$form->addExtraClass('center ' . $this->BaseCSSClasses());
// Set validation exemptions for specific actions
$form->setValidationExemptActions(array('restore', 'revert', 'deletefromlive', 'delete', 'unpublish', 'rollback', 'doRollback'));
$form->setValidationExemptActions(array(
'restore',
'revert',
'deletefromlive',
'delete',
'unpublish',
'rollback',
'doRollback',
'archive',
));
// Announce the capability so the frontend can decide whether to allow preview or not.
if ($record instanceof CMSPreviewable) {