From c4cf8f069bbe3248cda2062608f3600c20ca9396 Mon Sep 17 00:00:00 2001
From: nanaya
Date: Mon, 6 Nov 2023 16:55:05 +0900
Subject: [PATCH] Skip subforum count query and add current user variable
---
resources/views/forum/forums/show.blade.php | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/resources/views/forum/forums/show.blade.php b/resources/views/forum/forums/show.blade.php
index 0c621e36a0f..d658854a59e 100644
--- a/resources/views/forum/forums/show.blade.php
+++ b/resources/views/forum/forums/show.blade.php
@@ -13,7 +13,9 @@
])
@php
- $currentUserId = Auth::user()?->getKey();
+ $currentUser = Auth::user();
+ $currentUserId = $currentUser?->getKey();
+ $subforums = $forum->subforums;
@endphp
@section('content')
@include('forum._header', [
@@ -33,7 +35,7 @@
- @if ($forum->subforums()->exists())
+ @if (count($subforums) > 0)
{{ osu_trans("forum.subforums") }}
@@ -46,7 +48,7 @@
{{ osu_trans('forum.forums.latest_post') }}
- @foreach ($forum->subforums as $subforum)
+ @foreach ($subforums as $subforum)
@include('forum.forums._forum', ['currentUserId' => $currentUserId, 'forum' => $subforum])
@endforeach
@@ -132,7 +134,7 @@ class="simple-menu simple-menu--forum-list js-click-menu"
@endif
- @if (auth()->check() && auth()->user()->isAdmin())
+ @if ($currentUser !== null && $currentUser->isAdmin())