From 046f33f2e1783d79c386aba202a6304dcdb6dc37 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 14 Nov 2016 11:26:26 +0100 Subject: [PATCH] validate() is less strict on multi value attributes if the attribute has just one value the leading separator can be omitted --- SeedDMS_Core/Core/inc.ClassAttribute.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassAttribute.php b/SeedDMS_Core/Core/inc.ClassAttribute.php index 0966133c3..9a8bad29d 100644 --- a/SeedDMS_Core/Core/inc.ClassAttribute.php +++ b/SeedDMS_Core/Core/inc.ClassAttribute.php @@ -917,9 +917,14 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */ */ function validate($attrvalue) { /* {{{ */ if($this->getMultipleValues()) { - if(is_string($attrvalue)) - $values = explode($attrvalue[0], substr($attrvalue, 1)); - else + if(is_string($attrvalue)) { + $sep = $attrvalue[0]; + $vsep = $this->getValueSetSeparator(); + if($sep == $vsep) + $values = explode($attrvalue[0], substr($attrvalue, 1)); + else + $values = array($attrvalue); + } else $values = $attrvalue; } else { $values = array($attrvalue);