Merge remote-tracking branch 'ispc/master'

Marius Cramer

2014-08-13 f382f091aa97d10056b4c433aa55298fece010d4

 interface/web/sites/ftp_user_edit.php

@@ -82,7 +82,11 @@
         $app->tpl->setVar("username", $app->tools_sites->removePrefix($this->dataRecord['username'], $this->dataRecord['username_prefix'], $ftpuser_prefix));
      }

      if($this->dataRecord['username'] == "") {
         $app->tpl->setVar("username_prefix", $ftpuser_prefix);
      } else {
      $app->tpl->setVar("username_prefix", $app->tools_sites->getPrefix($this->dataRecord['username_prefix'], $ftpuser_prefix, $global_config['ftpuser_prefix']));
      }

      parent::onShowEnd();
   }