Merge branch 'master' into 'master'

Marius Cramer

2014-01-24 b50d36a340f2cb3a54f7fa29699ec5d0f064f31c

 interface/web/mail/mail_user_edit.php

@@ -205,8 +205,8 @@
         $this->dataRecord["homedir"] = $mail_config["homedir_path"];
         
         // Will be overwritten by mail_plugin
         $this->dataRecord['uid'] = 999989999;
         $this->dataRecord['gid'] = 999989999;
         $this->dataRecord['uid'] = -1;
         $this->dataRecord['gid'] = -1;
            
         //* Check if there is no alias or forward with this address
         $tmp = $app->db->queryOneRecord("SELECT count(forwarding_id) as number FROM mail_forwarding WHERE active = 'y' AND source = '".$app->db->quote($this->dataRecord["email"])."'");