ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into snipeit_v7_laravel10

Browse Source
This commit is contained in:
Brady Wetherington
2024-01-08 18:57:55 +00:00
parent d29b3633d1 4f8defb67d
commit f734e196e5
5316 changed files with 117843 additions and 109663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/ProfileController.php
View File

@@ -56,7 +56,7 @@ class ProfileController extends Controller
$user->phone = $request->input('phone');
if (! config('app.lock_passwords')) {
$user->locale = $request->input('locale', 'en');
$user->locale = $request->input('locale', 'en-US');
}
if ((Gate::allows('self.two_factor')) && ((Setting::getSettings()->two_factor_enabled == '1') && (! config('app.lock_passwords')))) {