Merge pull request #8423 from snipe/fix_ldap_test_php74

Fix ldap test php74
This commit is contained in:
snipe 2020-09-09 14:38:26 -07:00 committed by GitHub
commit f949a95cfb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -75,6 +75,7 @@ class SettingsController extends Controller
// Get a sample of 10 users so user can verify the data is correct // Get a sample of 10 users so user can verify the data is correct
try { try {
Log::info('Testing LDAP sync'); Log::info('Testing LDAP sync');
error_reporting(E_ALL & ~E_DEPRECATED); // workaround for php7.4, which deprecates ldap_control_paged_result
$users = $ldap->testUserImportSync(); $users = $ldap->testUserImportSync();
$message['user_sync'] = [ $message['user_sync'] = [
'users' => $users 'users' => $users