From e817e59fb8930a23d2635c0c4926063684cfa04c Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 7 Apr 2017 18:49:30 +0200 Subject: [PATCH] * LDAP: fix fatal error in minimal install --- api/src/Contacts/Ldap.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api/src/Contacts/Ldap.php b/api/src/Contacts/Ldap.php index 0b3bb40952..579583666c 100644 --- a/api/src/Contacts/Ldap.php +++ b/api/src/Contacts/Ldap.php @@ -1374,7 +1374,7 @@ class Ldap { if ($data['c']) { - $contact['adr_one_countryname'] = ExecMethod('phpgwapi.country.get_full_name',$data['c'][0]); + $contact['adr_one_countryname'] = Api\Country::get_full_name($data['c'][0]); } } @@ -1396,7 +1396,7 @@ class Ldap } elseif ($data['adr_one_countryname']) { - $ldapContact['c'] = ExecMethod('phpgwapi.country.country_code',$data['adr_one_countryname']); + $ldapContact['c'] = Api\Country::country_code($data['adr_one_countryname']); if ($ldapContact['c'] && strlen($ldapContact['c']) > 2) // Bad countryname when "custom" selected! { $ldapContact['c'] = array(); // should return error... @@ -1442,7 +1442,7 @@ class Ldap } elseif ($data['adr_one_countryname']) { - $ldapContact['c'] = ExecMethod('phpgwapi.country.country_code',$data['adr_one_countryname']); + $ldapContact['c'] = Api\Country::country_code($data['adr_one_countryname']); if ($ldapContact['c'] && strlen($ldapContact['c']) > 2) // Bad countryname when "custom" selected! { $ldapContact['c'] = array(); // should return error...