From ac34c0a987aaed480bb3a171a28b675ca0db6409 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Thu, 26 Feb 2015 05:51:57 -0500
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
---
interface/lib/classes/remoting_lib.inc.php | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php
index d85612b..0d89c1f 100644
--- a/interface/lib/classes/remoting_lib.inc.php
+++ b/interface/lib/classes/remoting_lib.inc.php
@@ -186,12 +186,11 @@
/**
* Rewrite the record data to be stored in the database
* and check values with regular expressions.
- * dummy parameter is only there for compatibility with params of base class
*
* @param record = Datensatz als Array
* @return record
*/
- function encode($record, $dbencode = true, $dummy = '') {
+ function encode($record, $tab = '', $dbencode = true) {
$new_record = $this->_encode($record, '', $dbencode, true);
if(isset($record['_ispconfig_pw_crypted'])) $new_record['_ispconfig_pw_crypted'] = $record['_ispconfig_pw_crypted']; // this one is not in form definitions!
--
Gitblit v1.9.1