Index: branches/RC/core/units/general/custom_fields.php =================================================================== diff -u -N -r8929 -r10609 --- branches/RC/core/units/general/custom_fields.php (.../custom_fields.php) (revision 8929) +++ branches/RC/core/units/general/custom_fields.php (.../custom_fields.php) (revision 10609) @@ -9,14 +9,20 @@ function GetValuesHash($values_list) { - $optionValuesStr = trim($this->ParseConfigSQL($values_list), ','); + $optionValuesStr = trim($this->ParseConfigSQL($values_list), ','); if (!$optionValuesStr) { // no options, then return empty array return Array(); } - + $optionValuesTmp = explode(',', $optionValuesStr); $optionValues = Array(); + + if (substr_count($optionValuesStr, '=') != count($optionValuesTmp)) { + trigger_error('Invalid symbol in ValueList field [' . substr($optionValuesStr, 0, 100) . ' ...]' , E_USER_NOTICE); + return Array (); + } + foreach ($optionValuesTmp as $optionValue) { list($key, $val) = explode('=', $optionValue); $val = (substr($val,0,1) == '+') ? substr($val, 1) : $this->Application->Phrase($val);