Skip to content

Commit

Permalink
Merge branch '4.x' of https://github.com/craftcms/cms into 5.x
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonkelly committed Dec 27, 2024
2 parents 9fbe2db + 4827b24 commit fbc675f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

- Fixed a bug where custom fields were getting included in rendered field layout forms, even if their `getInputHtml()` method returned an empty string.
- Fixed a bug where the password input on the Set Password page wasn’t including the “Show” button.
- Fixed a SQL error that could occur if an element was saved with a title longer than 255 characters.
- Fixed an error that could occur when creating nested entries within Matrix fields. ([#16331](https://github.com/craftcms/cms/issues/16331))
- Fixed an RCE vulnerability.

Expand Down
1 change: 0 additions & 1 deletion src/base/Element.php
Original file line number Diff line number Diff line change
Expand Up @@ -2790,7 +2790,6 @@ protected function defineRules(): array
StringValidator::class,
'max' => 255,
'disallowMb4' => true,
'on' => [self::SCENARIO_DEFAULT, self::SCENARIO_LIVE],
];
$rules[] = [
['title'],
Expand Down
5 changes: 5 additions & 0 deletions src/templates/login.twig
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@
document.write({{ formHtml|json_encode|raw }});
} else {
document.write({{ noCookiesHtml|json_encode|raw }});
setTimeout(() => {
if (document.activeElement !== document.body) {
$(document.activeElement).blur();
}
}, 50);
}
</script>
{% endblock %}
Expand Down

0 comments on commit fbc675f

Please sign in to comment.