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

Merge branch '5897-support-for-askme-in-booleanattribute-is-broken' into '1.4-dev'

Resolve "Support for %askme% in BooleanAttribute is broken"

Closes #5897

See merge request fusiondirectory/fd!432
Showing with 4 additions and 4 deletions
+4 -4
...@@ -58,7 +58,7 @@ class BooleanAttribute extends Attribute ...@@ -58,7 +58,7 @@ class BooleanAttribute extends Attribute
function inputValue ($value) function inputValue ($value)
{ {
if ($this->isTemplate() && $this->isTemplatable() && ($value == '%askme%')) { if ($this->isTemplate() && $this->isTemplatable() && ($value === '%askme%')) {
return $value; return $value;
} }
return ($value == $this->trueValue); return ($value == $this->trueValue);
...@@ -70,7 +70,7 @@ class BooleanAttribute extends Attribute ...@@ -70,7 +70,7 @@ class BooleanAttribute extends Attribute
if ($this->isTemplate() && $this->isTemplatable()) { if ($this->isTemplate() && $this->isTemplatable()) {
if (!isset($_POST[$this->getHtmlId()])) { if (!isset($_POST[$this->getHtmlId()])) {
$this->setPostValue(FALSE); $this->setPostValue(FALSE);
} elseif ($_POST[$this->getHtmlId()] == '%askme%') { } elseif ($_POST[$this->getHtmlId()] === '%askme%') {
$this->setPostValue('%askme%'); $this->setPostValue('%askme%');
} else { } else {
$this->setPostValue($_POST[$this->getHtmlId()] == 'TRUE'); $this->setPostValue($_POST[$this->getHtmlId()] == 'TRUE');
...@@ -83,7 +83,7 @@ class BooleanAttribute extends Attribute ...@@ -83,7 +83,7 @@ class BooleanAttribute extends Attribute
function computeLdapValue () function computeLdapValue ()
{ {
if ($this->isTemplate() && $this->isTemplatable() && ($this->value == '%askme%')) { if ($this->isTemplate() && $this->isTemplatable() && ($this->value === '%askme%')) {
return $this->value; return $this->value;
} else { } else {
return ($this->value ? $this->trueValue : $this->falseValue); return ($this->value ? $this->trueValue : $this->falseValue);
...@@ -109,7 +109,7 @@ class BooleanAttribute extends Attribute ...@@ -109,7 +109,7 @@ class BooleanAttribute extends Attribute
{ {
if ($this->isTemplatable()) { if ($this->isTemplatable()) {
$id = $this->getHtmlId(); $id = $this->getHtmlId();
if ($this->getValue() == '%askme%') { if ($this->getValue() === '%askme%') {
$selected = '%askme%'; $selected = '%askme%';
} elseif ($this->getValue()) { } elseif ($this->getValue()) {
$selected = 'TRUE'; $selected = 'TRUE';
......
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