Commit d403e63d authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Merge branch '6056-supann-tab-in-groups-not-accept-values-if-added-normaly' into '1.4-dev'

Resolve "Supann tab in group templates does not accept text values"

See merge request fusiondirectory/fd!725
Showing with 3 additions and 1 deletion
+3 -1
......@@ -549,7 +549,9 @@ class UsersGroupsRolesAttribute extends ObjectsAttribute
protected function fillDisplayValueFrom ($i, $attrs)
{
if (!isset($attrs[$this->display_attr])) {
if ($this->isTemplate() && ($attrs === NULL)) {
$this->displays[$i] = $this->value[$i];
} elseif (!isset($attrs[$this->display_attr])) {
unset($this->value[$i]);
} else {
$cn = $attrs['cn'][0];
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment