amacocian/monica
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix: fix event dispatch (#2555)

Browse Source
This commit is contained in:
Alexis Saettler
2019-04-01 06:11:38 +02:00
committed by GitHub
parent afcafa679b
commit 397c3e4885
20 changed files with 406 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/SettingsController.php
+2 -2
View File
@@ -25,8 +25,8 @@ use App\Http\Requests\SettingsRequest;
use Illuminate\Support\Facades\Storage;
use App\Http\Requests\InvitationRequest;
use App\Services\Contact\Tag\DestroyTag;
use PragmaRX\Google2FALaravel\Google2FA;
use App\Services\Account\DestroyAllDocuments;
use PragmaRX\Google2FALaravel\Facade as Google2FA;
use App\Http\Resources\Settings\U2fKey\U2fKey as U2fKeyResource;
class SettingsController
@@ -528,7 +528,7 @@ class SettingsController
->get();
return view('settings.security.index')
->with('is2FAActivated', app('pragmarx.google2fa')->isActivated())
->with('is2FAActivated', Google2FA::isActivated())
->with('currentkeys', U2fKeyResource::collection($u2fKeys));
}