fix condition in find_for_ldap_auth

Jakub Jirutka
1 parent ad265b96
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
app/models/user.rb
@@ -91,7 +91,7 @@ class User &lt; 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
...	...	@@ -91,7 +91,7 @@ class User < ActiveRecord::Base
91	91	provider = auth.provider
92	92	name = auth.info.name.force_encoding("utf-8")
93	93	email = auth.info.email.downcase unless auth.info.email.nil?
94		- raise OmniAuth::Error, "LDAP accounts must provide an uid and email address" if uid.nil? and email.nil?
	94	+ raise OmniAuth::Error, "LDAP accounts must provide an uid and email address" if uid.nil? or email.nil?
95	95
96	96	if @user = User.find_by_extern_uid_and_provider(uid, provider)
97	97	@user
...	...