Merge branch 'mergebranch'

Marius Burkard

2016-01-04 cb287d1f1be13beaba7fe84c906dd0683dfb9fb5

 interface/lib/classes/tform_base.inc.php

@@ -127,6 +127,7 @@
      global $app, $conf;

      include $file;
      $app->plugin->raiseEvent($_SESSION['s']['module']['name'].':'.$form['name'] . ':on_before_formdef', $this);
      $this->formDef = $form;

      $this->module = $module;
@@ -150,8 +151,10 @@
         $wb = $app->functions->array_merge($wb_global, $wb);
      }
      if(isset($wb_global)) unset($wb_global);

		
      $this->wordbook = $wb;
		
      $app->plugin->raiseEvent($_SESSION['s']['module']['name'].':'.$app->tform->formDef['name'] . ':on_after_formdef', $this);

      $this->dateformat = $app->lng('conf_format_dateshort');
      $this->datetimeformat = $app->lng('conf_format_datetime');
@@ -875,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;