X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/a24f3d7d4759df6b509533daaa1c9686a074e9fe..f99c8ff:/app/Http/Controllers/HomeController.php diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index e325b9322..7f60d7009 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -1,10 +1,8 @@ -signedIn ? $this->entityRepo->getUserDraftPages(6) : []; $recentFactor = count($draftPages) > 0 ? 0.5 : 1; - $recents = $this->signedIn ? Views::getUserRecentlyViewed(12*$recentFactor, 0) : $this->entityRepo->getRecentlyCreatedBooks(10*$recentFactor); - $recentlyCreatedPages = $this->entityRepo->getRecentlyCreatedPages(5); - $recentlyUpdatedPages = $this->entityRepo->getRecentlyUpdatedPages(5); + $recents = $this->signedIn ? Views::getUserRecentlyViewed(12*$recentFactor, 0) : $this->entityRepo->getRecentlyCreated('book', 10*$recentFactor); + $recentlyCreatedPages = $this->entityRepo->getRecentlyCreated('page', 5); + $recentlyUpdatedPages = $this->entityRepo->getRecentlyUpdated('page', 5); return view('home', [ 'activity' => $activity, 'recents' => $recents, @@ -48,7 +46,7 @@ class HomeController extends Controller * @return \Illuminate\Contracts\Routing\ResponseFactory|\Symfony\Component\HttpFoundation\Response */ public function getTranslations() { - $locale = trans()->getLocale(); + $locale = app()->getLocale(); $cacheKey = 'GLOBAL_TRANSLATIONS_' . $locale; if (cache()->has($cacheKey) && config('app.env') !== 'development') { $resp = cache($cacheKey); @@ -62,10 +60,10 @@ class HomeController extends Controller ]; if ($locale !== 'en') { $enTrans = [ - 'common' => trans('common', [], null, 'en'), - 'components' => trans('components', [], null, 'en'), - 'entities' => trans('entities', [], null, 'en'), - 'errors' => trans('errors', [], null, 'en') + 'common' => trans('common', [], 'en'), + 'components' => trans('components', [], 'en'), + 'entities' => trans('entities', [], 'en'), + 'errors' => trans('errors', [], 'en') ]; $translations = array_replace_recursive($enTrans, $translations); }