filter: Fix whitespace sanitizing

Icinga · Oct 6, 2014 · 865ef76 · 865ef76
1 parent d27d993
commit 865ef76
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/library/Icinga/Data/Filter/Filter.php b/library/Icinga/Data/Filter/Filter.php
@@ -131,8 +131,6 @@ public static function where($col, $filter)
 
     public static function expression($col, $op, $expression)
     {
-        $col = trim($col);
-        $expression = is_array($expression) ? array_map('trim', $expression) : trim($expression);
         switch ($op) {
             case '=': return new FilterMatch($col, $op, $expression);
             case '<': return new FilterLessThan($col, $op, $expression);

diff --git a/library/Icinga/Data/Filter/FilterExpression.php b/library/Icinga/Data/Filter/FilterExpression.php
@@ -12,6 +12,8 @@ class FilterExpression extends Filter
 
     public function __construct($column, $sign, $expression)
     {
+        $column = trim($column);
+        $expression = is_array($expression) ? array_map('trim', $expression) : trim($expression);
         $this->column = $column;
         $this->sign = $sign;
         $this->expression = $expression;