From deb3716e433556f4d259a98ac3969169d11d779a Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Wed, 26 Mar 2014 05:45:41 -0400
Subject: [PATCH] Merge branch 'master_fixes' into 'master'
---
interface/lib/classes/tform_base.inc.php | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/interface/lib/classes/tform_base.inc.php b/interface/lib/classes/tform_base.inc.php
index e295d55..329f1ef 100644
--- a/interface/lib/classes/tform_base.inc.php
+++ b/interface/lib/classes/tform_base.inc.php
@@ -270,7 +270,7 @@
unset($tmp_recordid);
$querystring = str_replace("{AUTHSQL}", $this->getAuthSQL('r'), $querystring);
- $querystring = preg_replace_callback('@{AUTHSQL::(.+?)}@', "self::table_auth_sql", $querystring);
+ $querystring = preg_replace_callback('@{AUTHSQL::(.+?)}@', array($this, 'table_auth_sql'), $querystring);
// Getting the records
$tmp_records = $app->db->queryAllRecords($querystring);
@@ -312,6 +312,9 @@
}
+ function table_auth_sql($matches){
+ return $this->getAuthSQL('r', $matches[1]);
+ }
/**
* Get the key => value array of a form filled from a datasource definitiom
--
Gitblit v1.9.1