Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-01-07 ddb461f596d9f013afe4f215fabc0eabc62b1fb0

 interface/web/admin/users_edit.php

@@ -77,7 +77,7 @@
      global $app, $conf;

      $client = $app->db->queryOneRecord("SELECT * FROM sys_user WHERE userid = ".$this->id);
      $client_id = $client['client_id'];
      $client_id = $app->functions->intval($client['client_id']);
      $username = $app->db->quote($this->dataRecord["username"]);
      $old_username = $app->db->quote($this->oldDataRecord['username']);