Merge branch 'florian030/ispconfig3-master' into stable-3.1

Marius Burkard

2016-06-14 1ec27d7366ac58df1d2d8cfc426be2c33d9cfa2c

 interface/lib/classes/tform_actions.inc.php

@@ -46,7 +46,8 @@
      $app->tpl->newTemplate("tabbed_form.tpl.htm");

      // Load table definition from file
      $app->tform->loadFormDef($tform_def_file, (isset($_SESSION['s']['module']['name']) ? $_SESSION['s']['module']['name'] : ''));
      //$app->tform->loadFormDef($tform_def_file, (isset($_SESSION['s']['module']['name']) ? $_SESSION['s']['module']['name'] : ''));
      $app->tform->loadFormDef($tform_def_file);

      // Importing ID
      $this->id = (isset($_REQUEST["id"]))?$app->functions->intval($_REQUEST["id"]):0;