Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' of git.znuny.com:zammad/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2017-04-19 15:06:43 +02:00
commit 2d6e4eb9d2
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/import/ldap/user_factory.rb
View file

@ -5,7 +5,12 @@ module Import
def self.import(config: nil, ldap: nil, **kargs) def self.import(config: nil, ldap: nil, **kargs)
config ||= Setting.get('ldap_config') # config might be an empty Hash due to the ImportJob payload
# store column which will be an empty hash if the content is NULL
if config.blank?
config = Setting.get('ldap_config')
end
ldap ||= ::Ldap.new(config) ldap ||= ::Ldap.new(config)
@config = config @config = config