Index: mailalias.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mailalias/mailalias.module,v
retrieving revision 1.11
diff -r1.11 mailalias.module
2,3c2,14
< // $Id: mailalias.module,v 1.11 2006/04/09 04:28:18 weitzman Exp $
< 
---
> // $Id: mailalias.module,v 1.11.2.2 2006/04/09 04:31:37 weitzman Exp $
> function mailalias_email_exists($mail,$user = 0) {
>   $query = "SELECT mail FROM {users} WHERE ";
>   if($user != 0) {
>     $query .= "uid != ".$user." AND ";
>   }
>   $query .= "data LIKE '%%". $mail. "%%' OR mail = '".$mail."'";
>   $result = db_query($query);
>   if(db_num_rows($result) > 0) {
>     return t('The e-mail address %mail is used by another account.', array('%mail' => theme('placeholder', $mail)));
>   }
>   unset($result);
> }
20c31
<       if ($mail != null && $error = user_validate_mail($mail)) {
---
>       if (($mail != null && $error = user_validate_mail($mail)) || $error = mailalias_email_exists($mail,arg(1))) {
27d37
<