Helpers::extractHttpData() skips invalid entry or empty entries

nette · Aug 28, 2014 · e8dfd2a · e8dfd2a
1 parent c89d01e
commit e8dfd2a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Forms/Helpers.php b/src/Forms/Helpers.php
@@ -46,7 +46,7 @@ public static function extractHttpData(array $data, $htmlName, $type)
 			foreach ($data as $k => $v) {
 				$data[$k] = $v = static::sanitize($itype, $v);
 				if ($v === NULL) {
-					return array();
+					unset($data[$k]);
 				}
 			}
 			if ($type & Form::DATA_KEYS) {

diff --git a/tests/Forms/Controls.ImageButton.loadData.phpt b/tests/Forms/Controls.ImageButton.loadData.phpt
@@ -46,7 +46,7 @@ test(function() { // missing data
 test(function() { // malformed data
 	$_POST = array(
 		'malformed1' => array(1),
-		'malformed2' => array(array(NULL), 'x'),
+		'malformed2' => array(array(NULL)),
 	);
 
 	$form = new Form;

diff --git a/tests/Forms/Helpers.extractHttpData.phpt b/tests/Forms/Helpers.extractHttpData.phpt
@@ -75,7 +75,7 @@ test(function() { // files
 
 
 	Assert::equal(array($file, $file), Helpers::extractHttpData(array(
-		'multiple' => array('avatar' => array('x' => $file, $file)),
+		'multiple' => array('avatar' => array('x' => $file, NULL, $file)),
 	), 'multiple[avatar][]', Form::DATA_FILE));
 
 	Assert::equal(array('x' => $file, $file), Helpers::extractHttpData(array(