kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-05-03 12:46:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11520 from firefly-iii/release-1768367445

Browse Source 
🤖 Automatically merge the PR into the develop branch.
This commit is contained in:
github-actions[bot]
2026-01-14 06:10:53 +01:00
committed by GitHub
parent 84082d38f2 9070856b9c
commit 812b0e6940
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Providers/AppServiceProvider.php
View File

@@ -30,6 +30,7 @@ use Illuminate\Support\Facades\Schema;
use Illuminate\Support\ServiceProvider;
use Laravel\Passport\Passport;
use Override;
use function Safe\preg_match;
/**
@@ -55,7 +56,8 @@ class AppServiceProvider extends ServiceProvider
return response()
->json($value)
->withHeaders($headers);
->withHeaders($headers)
;
});
// blade extension
@@ -68,14 +70,14 @@ class AppServiceProvider extends ServiceProvider
return '';
});
Blade::if('partialroute', function (string $route, string $firstParam = ''): bool {
$name = Route::getCurrentRoute()->getName() ?? '';
$name = Route::getCurrentRoute()->getName() ?? '';
if ('' === $firstParam && str_contains($name, $route)) {
return true;
}
/** @var null|array $params */
$params = Route::getCurrentRoute()->parameters();
$params ??= [];
$params ??= [];
$objectType = $params['objectType'] ?? '';
return $objectType === $firstParam && str_contains($name, $route);

2
config/firefly.php
View File

@@ -79,7 +79,7 @@ return [
// see cer.php for exchange rates feature flag.
],
'version' => 'develop/2026-01-14',
'build_time' => 1768366713,
'build_time' => 1768367341,
'api_version' => '2.1.0', // field is no longer used.
'db_version' => 28, // field is no longer used.