tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Allow non-action buttons to pass through validation (fixes #2527)

Browse Source 
The specific example for this issue is InlineFormField - results in actionName() on non-object error. See #2527 for context.

Include parentheses for coding conventions
This commit is contained in:
Loz Calver 2013-10-14 11:51:54 +01:00
parent c05b7c2c8f
commit 3bbfca820b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/code/CMSForm.php
View File

@ -15,8 +15,9 @@ class CMSForm extends Form {
* @return boolean
*/
public function validate() {
$buttonClicked = $this->buttonClicked();
return (
in_array($this->buttonClicked()->actionName(), $this->getValidationExemptActions())
($buttonClicked && in_array($buttonClicked->actionName(), $this->getValidationExemptActions()))
|| parent::validate()
);
}