|
|
@@ -1424,9 +1424,11 @@ class TableAcl {
|
|
|
";
|
|
|
$res = $db->query($sql);
|
|
|
while ($r = $db->fetch($res)) {
|
|
|
- $valuesMap = V::get('valuesMap', array(), $attributes[$r->field_name]);
|
|
|
- $valuesMap[$r->value] = $r->label;
|
|
|
- $attributes[$r->field_name]['valuesMap'] = $valuesMap;
|
|
|
+ if (!empty($r->value) && !empty($r->label)) {
|
|
|
+ $valuesMap = V::get('valuesMap', array(), $attributes[$r->field_name]);
|
|
|
+ $valuesMap[$r->value] = $r->label;
|
|
|
+ $attributes[$r->field_name]['valuesMap'] = $valuesMap;
|
|
|
+ }
|
|
|
}
|
|
|
return $attributes;
|
|
|
}
|