#134 class lists not sorted (combos)

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@459 a333f486-631f-4898-b8df-5754b55c2be0

core/valuesetdef.class.inc.php

@@ -75,6 +75,7 @@ abstract class ValueSetDefinition
 				}
 			}
 		}
+		asort($aRet);
 		return $aRet;
 	}
 
@@ -223,7 +224,7 @@ class ValueSetEnum extends ValueSetDefinition
 		{
 			$aValues = $this->m_values;
 		}
-		else
+		elseif (is_string($this->m_values) && strlen($this->m_values) > 0)
 		{
 			$aValues = array();
 			foreach (explode(",", $this->m_values) as $sVal)
@@ -233,6 +234,10 @@ class ValueSetEnum extends ValueSetDefinition
 				$aValues[$sKey] = $sVal;
 			}
 		}
+		else
+		{
+			$aValues = array();
+		}
 		$this->m_aValues = $aValues;
 		return true;
 	}