kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-14 21:58:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10250 from firefly-iii/fix-nulls

Browse Source 
Fix nullpointers.
This commit is contained in:
James Cole
2025-05-04 17:09:16 +02:00
committed by GitHub
parent ae22c59f21 9ea8709835
commit b0d25a1d33
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Auth/LoginController.php
View File

@@ -220,7 +220,7 @@ class LoginController extends Controller
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function showLoginForm(?Request $request = null) public function showLoginForm(Request $request)
{ {
Log::channel('audit')->info('Show login form (1.1).'); Log::channel('audit')->info('Show login form (1.1).');

2
app/Http/Controllers/Auth/RegisterController.php
View File

@@ -175,7 +175,7 @@ class RegisterController extends Controller
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function showRegistrationForm(?Request $request = null) public function showRegistrationForm(Request $request)
{ {
$isDemoSite = app('fireflyconfig')->get('is_demo_site', config('firefly.configuration.is_demo_site'))->data; $isDemoSite = app('fireflyconfig')->get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
$pageTitle = (string) trans('firefly.register_page_title'); $pageTitle = (string) trans('firefly.register_page_title');

4
resources/views/partials/menu-sidebar.twig
View File

@@ -15,10 +15,10 @@
</a> </a>
</li> </li>
<li class="{{ activeRoutePartial('bills') }}"> <li class="{{ activeRoutePartial('subscriptions') }}">
<a href="{{ route('subscriptions.index') }}"> <a href="{{ route('subscriptions.index') }}">
<em class="fa fa-calendar-o fa-fw"></em> <em class="fa fa-calendar-o fa-fw"></em>
<span>{{ 'bills'|_ }}</span> <span>{{ 'subscriptions'|_ }}</span>
</a> </a>
</li> </li>