From 3bbfca820b3d6de9a9ea3f4e24f9f8d8f7fe718b Mon Sep 17 00:00:00 2001 From: Loz Calver Date: Mon, 14 Oct 2013 11:51:54 +0100 Subject: [PATCH] Allow non-action buttons to pass through validation (fixes #2527) The specific example for this issue is InlineFormField - results in actionName() on non-object error. See #2527 for context. Include parentheses for coding conventions --- admin/code/CMSForm.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/admin/code/CMSForm.php b/admin/code/CMSForm.php index f364ad4ff..a03d51178 100644 --- a/admin/code/CMSForm.php +++ b/admin/code/CMSForm.php @@ -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() ); }