Skip to content

Commit f1e6bfa

Browse files
[6.x] Fix permission labels not being localized correctly (#12316)
Co-authored-by: Jason Varga <jason@pixelfear.com>
1 parent f45f50e commit f1e6bfa

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/Http/Middleware/CP/Localize.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@ public function handle($request, Closure $next)
3030

3131
Date::setToStringFormat(DateTime::ATOM);
3232

33-
$response = $next($request);
34-
35-
Date::setToStringFormat($originalToStringFormat);
33+
try {
34+
$response = $next($request);
35+
} finally {
36+
Date::setToStringFormat($originalToStringFormat);
37+
}
3638

3739
return $response;
3840
}

src/Providers/CpServiceProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ protected function registerMiddlewareGroups()
103103

104104
$router->middlewareGroup('statamic.cp.authenticated', [
105105
\Statamic\Http\Middleware\CP\AuthenticateSession::class,
106-
\Statamic\Http\Middleware\CP\Authorize::class,
107106
\Statamic\Http\Middleware\CP\Localize::class,
107+
\Statamic\Http\Middleware\CP\Authorize::class,
108108
\Statamic\Http\Middleware\CP\SelectedSite::class,
109109
\Statamic\Http\Middleware\CP\BootPermissions::class,
110110
\Statamic\Http\Middleware\CP\BootPreferences::class,

0 commit comments

Comments
 (0)