diff --git a/app/models/user.rb b/app/models/user.rb index 1b53bda2c403e6bc4b2a5ab3eda0b298dcf7fceb..b0538cb7b03cb60ee253a5954a7dd84a5c9e3cc7 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -91,7 +91,7 @@ class User < ActiveRecord::Base provider = auth.provider name = auth.info.name.force_encoding("utf-8") email = auth.info.email.downcase unless auth.info.email.nil? - raise OmniAuth::Error, "LDAP accounts must provide an uid and email address" if uid.nil? and email.nil? + raise OmniAuth::Error, "LDAP accounts must provide an uid and email address" if uid.nil? or email.nil? if @user = User.find_by_extern_uid_and_provider(uid, provider) @user