Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

Florian Schaal

2014-06-04 fac03aa97013f819bbc6c201d107ebfc4fab4e18

Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

 interface/lib/classes/remote.d/client.inc.php

@@ -182,6 +182,9 @@
        $app->uses('remoting_lib');
        $app->remoting_lib->loadFormDef('../client/form/' . (isset($params['limit_client']) && $params['limit_client'] > 0 ? 'reseller' : 'client') . '.tform.php');
        $old_rec = $app->remoting_lib->getDataRecord($client_id);
		
        //* merge old record with params, so only new values have to be set in $params
        $params = $app->functions->array_merge($old_rec,$params);

        // we need the previuos templates assigned here
        $this->oldTemplatesAssigned = $app->db->queryAllRecords('SELECT * FROM `client_template_assigned` WHERE `client_id` = ' . $client_id);

 interface/lib/classes/remoting.inc.php

@@ -340,6 +340,10 @@

        //* Load the form definition
        $app->remoting_lib->loadFormDef($formdef_file);
		
        //* get old record and merge with params, so only new values have to be set in $params
        $old_rec = $app->remoting_lib->getDataRecord($primary_id);
        $params = $app->functions->array_merge($old_rec,$params);

        //* Get the SQL query
        $sql = $app->remoting_lib->getSQL($params, 'UPDATE', $primary_id);