Skip to content

Fix: null author locale when saving new content #3697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bobvandevijver merged 4 commits into from
Apr 9, 2026
Merged

Fix: null author locale when saving new content #3697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
431486e
Fix null author locale when saving new content
MrWeb Apr 4, 2026
0f188ba
Update src/Controller/Backend/ContentEditController.php
MrWeb Apr 9, 2026
a89fd00
Remove PHPStan baseline entry for fixed getLocale() null check
MrWeb Apr 9, 2026
49b937a
Merge branch '6.0' into fix/null-author-locale
MrWeb Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions phpstan-baseline.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1147,12 +1147,6 @@
'count' => 2,
'path' => __DIR__ . '/src/Controller/Backend/ContentEditController.php',
];
$ignoreErrors[] = [
'message' => '#^Cannot call method getLocale\\(\\) on Bolt\\\\Entity\\\\User\\|null\\.$#',
'identifier' => 'method.nonObject',
'count' => 1,
'path' => __DIR__ . '/src/Controller/Backend/ContentEditController.php',
];
$ignoreErrors[] = [
'message' => '#^Method Bolt\\\\Controller\\\\Backend\\\\ContentEditController\\:\\:getFieldToUpdate\\(\\) has parameter \\$fieldDefinition with no type specified\\.$#',
'identifier' => 'missingType.parameter',
Expand Down
3 changes: 1 addition & 2 deletions src/Controller/Backend/ContentEditController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,9 @@ public function save(Request $request, ?Content $originalContent = null, ?Conten
$event = new ContentEvent($content);
$this->dispatcher->dispatch($event, ContentEvent::POST_SAVE);

$locale = $originalAuthor->getLocale();

// If we're "Saving Ajaxy"
if ($request->isXmlHttpRequest()) {
$locale = $originalAuthor ? $originalAuthor->getLocale() : $request->getLocale();
$modified = sprintf(
'(%s: %s)',
$this->translator->trans('field.modifiedAt', [], null, $locale),
Expand Down
Loading