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

Merge branch '5857-template-cannot-fill-setattributes' into '1.3-dev'

Resolve "Template cannot fill SetAttributes"

See merge request fusiondirectory/fd!334

(cherry picked from commit 8502bb98)

a423694a :ambulance: fix(simpleplugin) Do not reset SetAttribute to default in loadAttrValue
Showing with 0 additions and 10 deletions
+0 -10
...@@ -64,8 +64,6 @@ class SetAttribute extends Attribute ...@@ -64,8 +64,6 @@ class SetAttribute extends Attribute
for ($i = 0; $i < $attrs[$this->getLdapName()]["count"]; $i++) { for ($i = 0; $i < $attrs[$this->getLdapName()]["count"]; $i++) {
$this->value[] = $attrs[$this->getLdapName()][$i]; $this->value[] = $attrs[$this->getLdapName()][$i];
} }
} else {
$this->resetToDefault();
} }
} }
...@@ -431,8 +429,6 @@ class OrderedArrayAttribute extends SetAttribute ...@@ -431,8 +429,6 @@ class OrderedArrayAttribute extends SetAttribute
$this->value[] = $value; $this->value[] = $value;
} }
} }
} else {
$this->resetToDefault();
} }
if ($this->order) { if ($this->order) {
$this->reIndexValues(); $this->reIndexValues();
...@@ -713,8 +709,6 @@ class SubNodesAttribute extends OrderedArrayAttribute ...@@ -713,8 +709,6 @@ class SubNodesAttribute extends OrderedArrayAttribute
unset($attribute); unset($attribute);
$this->value[] = $this->attribute->getValue(); $this->value[] = $this->attribute->getValue();
} }
} else {
$this->resetToDefault();
} }
} }
......
...@@ -777,8 +777,6 @@ class HiddenArrayAttribute extends HiddenAttribute ...@@ -777,8 +777,6 @@ class HiddenArrayAttribute extends HiddenAttribute
for ($i = 0; $i < $attrs[$this->getLdapName()]['count']; $i++) { for ($i = 0; $i < $attrs[$this->getLdapName()]['count']; $i++) {
$this->value[] = $attrs[$this->getLdapName()][$i]; $this->value[] = $attrs[$this->getLdapName()][$i];
} }
} else {
$this->resetToDefault();
} }
} }
} }
...@@ -859,8 +857,6 @@ class DisplayLDAPArrayAttribute extends Attribute ...@@ -859,8 +857,6 @@ class DisplayLDAPArrayAttribute extends Attribute
for ($i = 0; $i < $attrs[$this->getLdapName()]['count']; $i++) { for ($i = 0; $i < $attrs[$this->getLdapName()]['count']; $i++) {
$this->value[] = $attrs[$this->getLdapName()][$i]; $this->value[] = $attrs[$this->getLdapName()][$i];
} }
} else {
$this->resetToDefault();
} }
} }
......
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