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

Marius Cramer

2013-11-20 1a2cbfbf0cd666af05c28c3a7e51de3fb59bdd99

 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']);