Merge remote-tracking branch 'ispc/master'

Marius Cramer

2014-08-13 f382f091aa97d10056b4c433aa55298fece010d4

 interface/web/sites/database_user_edit.php

@@ -103,8 +103,11 @@
         $app->tpl->setVar("database_user", $app->tools_sites->removePrefix($this->dataRecord['database_user'], $this->dataRecord['database_user_prefix'], $dbuser_prefix));
      }


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

      parent::onShowEnd();
   }