diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 4c15c0406b..b132445c70 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -297,8 +297,10 @@ class AccountController extends Controller throw new FireflyException('End is after start!'); // @codeCoverageIgnore } + + $what = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type)); // used for menu $today = new Carbon; - $subTitleIcon = config('firefly.subIconsByIdentifier.' . $account->accountType->type); + $subTitleIcon = config(sprintf('firefly.subIconsByIdentifier.%s', $account->accountType->type)); $page = (int)$request->get('page'); $pageSize = (int)Preferences::get('listPageSize', 50)->data; $currencyId = (int)$this->repository->getMetaValue($account, 'currency_id'); @@ -320,7 +322,7 @@ class AccountController extends Controller return view( 'accounts.show', - compact('account', 'showAll', 'currency', 'today', 'periods', 'subTitleIcon', 'transactions', 'subTitle', 'start', 'end', 'chartUri') + compact('account', 'showAll', 'what', 'currency', 'today', 'periods', 'subTitleIcon', 'transactions', 'subTitle', 'start', 'end', 'chartUri') ); } diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php index 66548bd11b..a2945e833d 100644 --- a/app/Support/Twig/General.php +++ b/app/Support/Twig/General.php @@ -106,7 +106,7 @@ class General extends Twig_Extension $what = $args[2]; // name of the route. $activeWhat = $context['what'] ?? false; - if ($what === $activeWhat && !(false === strpos(Route::getCurrentRoute()->getName(), $route))) { + if ($what === $activeWhat && !(false === stripos(Route::getCurrentRoute()->getName(), $route))) { return 'active'; }