Merge pull request #684 from cosmocode/clear-multi-media

Clear multi field of type media

Author: annda

_test/ValidatorTest.php

@@ -6,6 +6,7 @@
 use dokuwiki\plugin\struct\test\mock\Assignments;
 use dokuwiki\plugin\struct\test\mock\Lookup;
 use dokuwiki\plugin\struct\types\Decimal;
+use dokuwiki\plugin\struct\types\Media;
 use dokuwiki\plugin\struct\types\Text;
 
 /**
@@ -105,6 +106,17 @@ public function test_validate_empty_multivalue()
 
         $validator->validateValue($col, $value);
         $this->assertEquals([''], $value);
+
+        // some fields like media or date can post an array with multiple empty strings
+        // because they use multiple inputs instead of comma separation in one input
+        $media = new Media(null, '', true);
+        $col = new Column(10, $media);
+
+        $validator = new mock\ValueValidator();
+        $value = ['', '', ''];
+
+        $validator->validateValue($col, $value);
+        $this->assertEquals([''], $value);
     }
 
 }

meta/ValueValidator.php

@@ -42,9 +42,14 @@ public function validateValue(Column $col, &$rawvalue)
         }
         // strip empty fields from multi vals
         // but keep at least one so we can properly delete multivalues on update
-        if (is_array($rawvalue) && count($rawvalue) > 1) {
+        // some fields like media or date can post an array with multiple empty strings
+        // because they use multiple inputs instead of comma separation in one input
+        if (is_array($rawvalue)) {
             $rawvalue = array_filter($rawvalue, [$this, 'filter']);
             $rawvalue = array_values($rawvalue); // reset the array keys
+            if (empty($rawvalue)) {
+                $rawvalue = [''];
+            }
         }
 
         // validate data