From ba99059b4cf262cd99e20e3689f234dad6f430a9 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Thu, 28 May 2015 15:19:44 +0200 Subject: [PATCH] (mvc) OptionField support empty strings in validation --- .../app/models/OPNsense/Base/FieldTypes/OptionField.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/OptionField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/OptionField.php index 348d9e67a..24e23dc8e 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/OptionField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/OptionField.php @@ -100,7 +100,12 @@ class OptionField extends BaseField if ($countid > 0) { $validationMask .= '|'; } - $validationMask .= $key ; + if ($key == "") { + // match on empty strings + $validationMask .= "^$"; + } else { + $validationMask .= $key ; + } $countid++; } $validationMask .= ')';