Merged revisions 2095-2129 which contain bugfixes from stable branch.

tbrehm

2010-11-24 9f56bd96367f7f3cfa295f23b9129a7dfa1f21af

 interface/lib/classes/remoting.inc.php

@@ -1925,7 +1925,7 @@
      $app->remoting_lib->loadUserProfile($reseller_id);
      
      //* load the client template
      if(isset($params['template_master']) and $params['template_master'])
      if(isset($params['template_master']) and $params['template_master'] > 0)
      {
         $template=$app->db->queryOneRecord("SELECT * FROM client_template WHERE template_id=".intval($params['template_master']));
         $params=array_merge($params,$template);