From 76904d3f677520eb191a90f2abb15b9df5fd8ae9 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Tue, 18 Dec 2012 14:02:31 +0100
Subject: make sure we have email_aliases at all before testing for an error on
 the last

---
 users/app/models/user.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'users/app/models')

diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 0773f28..1999a28 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -126,7 +126,7 @@ class User < CouchRest::Model::Base
   ##
 
   def email_differs_from_email_aliases
-    return if email_aliases.last.errors.any?
+    return if email_aliases.any? and email_aliases.last.errors.any?
     if email_aliases.map(&:email).include?(email)
       errors.add(:email, "may not be the same as an alias")
     end
-- 
cgit v1.2.3