From 40f962200e9ef31cdf41920215bc5f251da7cb4b Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Mon, 04 Jan 2016 09:08:21 -0500
Subject: [PATCH] - reverted last change
---
interface/lib/classes/tform_base.inc.php | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/tform_base.inc.php b/interface/lib/classes/tform_base.inc.php
index 95162a7..87e7a68 100644
--- a/interface/lib/classes/tform_base.inc.php
+++ b/interface/lib/classes/tform_base.inc.php
@@ -126,8 +126,8 @@
function loadFormDef($file, $module = '') {
global $app, $conf;
- $app->plugin->raiseEvent('on_before_formdef', $module);
include $file;
+ $app->plugin->raiseEvent($_SESSION['s']['module']['name'].':'.$form['name'] . ':on_before_formdef', $this);
$this->formDef = $form;
$this->module = $module;
@@ -152,9 +152,9 @@
}
if(isset($wb_global)) unset($wb_global);
- $app->plugin->raiseEvent('on_after_formdef', $module);
-
$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');
@@ -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;
--
Gitblit v1.9.1