Merge branch 'mergebranch'

Marius Burkard

2016-01-04 cb287d1f1be13beaba7fe84c906dd0683dfb9fb5

 interface/lib/classes/tform_base.inc.php

@@ -878,6 +878,9 @@
            case 'TRIM':
               $returnval = trim($returnval);
               break;
            case 'NOWHITESPACE':
               $returnval = preg_replace('/\s+/', '', $returnval);
               break;
            default:
               $this->errorMessage .= "Unknown Filter: ".$filter['type'];
               break;