From 335b3ed19791d2bf5aea9c95f46af925ebc80412 Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Mon, 20 Aug 2012 12:58:03 +0200 Subject: [PATCH] fix condition in find_for_ldap_auth --- app/models/user.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index 1b53bda..b0538cb 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 -- libgit2 0.21.2