diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 999f6b711..9f03ef728 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -41,7 +41,7 @@ class AccountController extends Controller if(EmailVerification::whereUserId(Auth::id())->count() !== 0) { return redirect()->back()->with('status', 'A verification email has already been sent! Please check your email.'); } - + $user = User::whereNull('email_verified_at')->find(Auth::id()); $utoken = hash('sha512', $user->id); $rtoken = str_random(40); @@ -60,8 +60,8 @@ class AccountController extends Controller public function confirmVerifyEmail(Request $request, $userToken, $randomToken) { - $verify = EmailVerification::where(DB::raw('BINARY `user_token`'), $userToken) - ->where(DB::raw('BINARY `random_token`'), $randomToken) + $verify = EmailVerification::where(DB::raw('BINARY user_token'), $userToken) + ->where(DB::raw('BINARY random_token'), $randomToken) ->firstOrFail(); if(Auth::id() === $verify->user_id) { $user = User::find(Auth::id()); diff --git a/resources/views/status/template.blade.php b/resources/views/status/template.blade.php index 7a3910887..baf37c296 100644 --- a/resources/views/status/template.blade.php +++ b/resources/views/status/template.blade.php @@ -74,7 +74,7 @@ @if($item->comments()->count() > 3)
- Load more comments + Load more comments
@endif
@@ -93,12 +93,6 @@

@else - @foreach($item->comments->reverse()->take(3) as $comment) -

- {{$comment->profile->username}} - {!! str_limit($item->rendered ?? e($item->caption), 150) !!} -

- @endforeach @endif