LSattribute :: generateValue() : Fixed bug when generated value is empty.

This commit is contained in:
Benjamin Renard 2010-03-09 17:40:22 +01:00
parent aeb54731ef
commit 35f293e871

View file

@ -472,6 +472,7 @@ class LSattribute {
* @retval boolean true si la valeur à put être générée, false sinon * @retval boolean true si la valeur à put être générée, false sinon
*/ */
function generateValue() { function generateValue() {
$value=false;
if (function_exists($this -> config['generate_function'])) { if (function_exists($this -> config['generate_function'])) {
$value=call_user_func($this -> config['generate_function'],$this -> ldapObject); $value=call_user_func($this -> config['generate_function'],$this -> ldapObject);
} }
@ -481,11 +482,16 @@ class LSattribute {
else if (is_string($this -> config['default_value']) && strlen($this -> config['default_value'])>0) { else if (is_string($this -> config['default_value']) && strlen($this -> config['default_value'])>0) {
$value = $this -> config['default_value']; $value = $this -> config['default_value'];
} }
if (!empty($value)) { if ($value!==false) {
if (!is_array($value)) { if (!empty($value)) {
$value=array($value); if (!is_array($value)) {
$value=array($value);
}
$this -> updateData=$value;
}
else {
$this -> updateData=array();
} }
$this -> updateData=$value;
return true; return true;
} }
return; return;