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

Marius Cramer

2014-04-04 36420c614b259a0ca1aa7db14b1215db60c4c5ce

 interface/lib/classes/validate_client.inc.php

@@ -53,7 +53,7 @@
            }
         }
      } else {
         $num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM sys_user WHERE username = '".$app->db->quote($field_value)."' AND client_id != ".$client_id);
         $num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM sys_user WHERE username = '".$app->db->quote($field_value)."' AND client_id != ".$app->functions->intval($client_id));
         if($num_rec["number"] > 0) {
            $errmsg = $validator['errmsg'];
            if(isset($app->tform->wordbook[$errmsg])) {