From ae99e6724355dac31083206c96a7b2a2ef0d755b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= <matma.rex@gmail.com>
Date: Thu, 24 Nov 2016 17:42:29 +0100
Subject: [PATCH] HTMLFormFieldCloner: Don't try to validate hidden fields

Follow-up to 788526c2d1a4a9e32722c0a26b4a5027f00aa9bb.

To test: try to create a SecurePoll of type "Approval vote". Without this
patch, but with I81d04dca6cbb499a15828fd33b01746b68c694da, an invisible
field (only applicable for "Range voting (plurality)") will fail validation.

Change-Id: I37e50799ba1f0e0e64a197818b58444f5b056bf0
---
 includes/htmlform/fields/HTMLFormFieldCloner.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/includes/htmlform/fields/HTMLFormFieldCloner.php b/includes/htmlform/fields/HTMLFormFieldCloner.php
index 5d8f491881..09fe1bc6ab 100644
--- a/includes/htmlform/fields/HTMLFormFieldCloner.php
+++ b/includes/htmlform/fields/HTMLFormFieldCloner.php
@@ -240,6 +240,9 @@ class HTMLFormFieldCloner extends HTMLFormField {
 				if ( !array_key_exists( $fieldname, $value ) ) {
 					continue;
 				}
+				if ( $field->isHidden( $alldata ) ) {
+					continue;
+				}
 				$ok = $field->validate( $value[$fieldname], $alldata );
 				if ( $ok !== true ) {
 					return false;
-- 
2.20.1