[icinga-checkins] icinga.org: icingaweb2-module-director/master: FormDataFilter: correct 'in ' operator handling

git at icinga.org git at icinga.org
Tue Dec 13 11:41:30 CET 2016


Module: icingaweb2-module-director
Branch: master
Commit: 1dc0aad82884487ee8b71eb5f88026bd7dabe6cc
URL:    https://git.icinga.org/?p=icingaweb2-module-director.git;a=commit;h=1dc0aad82884487ee8b71eb5f88026bd7dabe6cc

Author: Thomas Gelf <thomas at gelf.net>
Date:   Tue Dec 13 11:39:15 2016 +0100

FormDataFilter: correct 'in' operator handling

fixes #13543

---

 application/views/helpers/FormDataFilter.php |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/views/helpers/FormDataFilter.php b/application/views/helpers/FormDataFilter.php
index 1e57216..0087bd1 100644
--- a/application/views/helpers/FormDataFilter.php
+++ b/application/views/helpers/FormDataFilter.php
@@ -291,9 +291,10 @@ class Zend_View_Helper_FormDataFilter extends Zend_View_Helper_FormElement
         if ($filter === null) {
             $sign = null;
         } else {
-            if ($filter->getExpression() === true) {
+            $expression = json_decode($filter->getExpression());
+            if ($expression === true) {
                 $sign = 'true';
-            } elseif (is_array($filter->getExpression())) {
+            } elseif (is_array($expression)) {
                 $sign = 'in';
             } else {
                 $sign = $filter->getSign();



More information about the icinga-checkins mailing list