Index: branches/RC/core/units/general/custom_fields.php
===================================================================
diff -u -N -r10609 -r10857
--- branches/RC/core/units/general/custom_fields.php	(.../custom_fields.php)	(revision 10609)
+++ branches/RC/core/units/general/custom_fields.php	(.../custom_fields.php)	(revision 10857)
@@ -9,13 +9,13 @@
 
 	function GetValuesHash($values_list)
 	{
-		$optionValuesStr = trim($this->ParseConfigSQL($values_list), ',');
+		$optionValuesStr = trim($this->ParseConfigSQL($values_list), VALUE_LIST_SEPARATOR);
 		if (!$optionValuesStr) {
 			// no options, then return empty array
 			return Array();
 		}
 
-		$optionValuesTmp = explode(',', $optionValuesStr);
+		$optionValuesTmp = explode(VALUE_LIST_SEPARATOR, $optionValuesStr);
 		$optionValues = Array();
 
 		if (substr_count($optionValuesStr, '=') != count($optionValuesTmp)) {
Index: branches/RC/core/kernel/constants.php
===================================================================
diff -u -N -r10294 -r10857
--- branches/RC/core/kernel/constants.php	(.../constants.php)	(revision 10294)
+++ branches/RC/core/kernel/constants.php	(.../constants.php)	(revision 10857)
@@ -71,5 +71,16 @@
 	define('clCREATE', 1);
 	define('clUPDATE', 2);
 	define('clDELETE', 3);
+	
+	/**
+	 * Separator for ValueList fields
+	 *
+	 */
+	define('VALUE_LIST_SEPARATOR', '||');
 
+	// template editing modes
+	define('EDITING_MODE_CMS', 1);
+	define('EDITING_MODE_LAYOUT', 2);
+	define('EDITING_MODE_DESIGN', 3);
+
 ?>
\ No newline at end of file