diff --git a/app/Console/Commands/LdapSync.php b/app/Console/Commands/LdapSync.php index f90aeafd8d..88015b14a1 100644 --- a/app/Console/Commands/LdapSync.php +++ b/app/Console/Commands/LdapSync.php @@ -182,7 +182,7 @@ class LdapSync extends Command // Inject location information fields for ($i = 0; $i < $results['count']; $i++) { $results[$i]['ldap_location_override'] = false; - $results[$i]['location_id'] = 0; + $results[$i]['location_id'] = null; } // Grab subsets based on location-specific DNs, and overwrite location for these users. diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php index 2cc698263f..809e00beba 100644 --- a/app/Http/Transformers/ActionlogsTransformer.php +++ b/app/Http/Transformers/ActionlogsTransformer.php @@ -113,8 +113,8 @@ class ActionlogsTransformer // Display the changes if the user is an admin or superadmin if (Gate::allows('admin')) { - $clean_meta[$fieldname]['old'] = ($enc_old) ? unserialize($enc_old): ''; - $clean_meta[$fieldname]['new'] = ($enc_new) ? unserialize($enc_new): ''; + $clean_meta[$fieldname]['old'] = ($enc_old) ? unserialize($enc_old, ['allowed_classes' => false]) : ''; + $clean_meta[$fieldname]['new'] = ($enc_new) ? unserialize($enc_new, ['allowed_classes' => false]) : ''; } }