Skip to content

Commit aac1be1

Browse files
author
Bernhard Schmitt
committed
Merge branch '8.3' into 8.4
2 parents 65c7016 + dc33198 commit aac1be1

File tree

2 files changed

+59
-1
lines changed

2 files changed

+59
-1
lines changed

Neos.Neos/Classes/Aspects/NodeTypeConfigurationEnrichmentAspect.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ protected function shouldFetchTranslation(array $parentConfiguration, $fieldName
290290
{
291291
$fieldValue = array_key_exists($fieldName, $parentConfiguration) ? $parentConfiguration[$fieldName] : '';
292292

293-
return (trim($fieldValue) === 'i18n');
293+
return ($fieldValue !== null && trim($fieldValue) === 'i18n');
294294
}
295295

296296
/**
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
`8.3.30 (2025-12-12) <https://github.com/neos/neos-development-collection/releases/tag/8.3.30>`_
2+
================================================================================================
3+
4+
Overview of merged pull requests
5+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
6+
7+
`BUGFIX: Hotfix media browser horizontal over-scroll <https://github.com/neos/neos-development-collection/pull/5708>`_
8+
----------------------------------------------------------------------------------------------------------------------
9+
10+
Resolves: https://github.com/neos/neos-development-collection/issues/5685 at a bare minimum effort ... no extra glory ... not going over start and getting 200DM in cash... nuthing
11+
12+
**Upgrade instructions**
13+
14+
15+
* Packages: ``Media.Browser``
16+
17+
`BUGFIX: Creating valid „more“ url in history module <https://github.com/neos/neos-development-collection/pull/5703>`_
18+
--------------------------------------------------------------------------------------------------------------------------
19+
20+
With this change the uri to load more history entries is correctly generated again and all history entries can be browsed.
21+
22+
* Resolves: `#5702 <https://github.com/neos/neos-development-collection/issues/5702>`_
23+
24+
* Packages: ``Neos``
25+
26+
`BUGFIX: Nodes show action does not handle `\JsonSerializable` objects and crashes if object is not StringAble <https://github.com/neos/neos-development-collection/pull/5706>`_
27+
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
28+
29+
With https://github.com/neos/neos-ui/pull/3723 and https://github.com/neos/neos-ui/pull/3723 the ``NodePropertyConverterService`` returns ``\\JsonSerializable`` objects directly in the expectation that they are serialized directly. This is also true for the usages within the Neos Ui.
30+
31+
But this legacy endpoint here in Neos doesnt do it. And throws
32+
33+
"Object of class Sitegeist\\Archaeopteryx\\Link could not be converted to string"
34+
35+
on some occasions whenever the endoint is used. Funnely the Neos Ui really does not care about the node properties rendered here via fluid in html so we could also return "nudelsuppe" here. Its just important that it not crashes.
36+
37+
https://github.com/neos/neos-development-collection/blob/`1aeef6c02142b41e4626ea32434f06cd0f84e9bd <https://github.com/neos/neos-development-collection/commit/1aeef6c02142b41e4626ea32434f06cd0f84e9bd>`_/Neos.Neos/Resources/Private/Templates/Service/Nodes/Show.html#L30-L35
38+
39+
In the future we should have this whole thing killed :D
40+
41+
**Upgrade instructions**
42+
43+
44+
* Packages: ``.github`` ``Neos``
45+
46+
`TASK: Update pdf.js library to version v5.4.394 <https://github.com/neos/neos-development-collection/pull/5687>`_
47+
------------------------------------------------------------------------------------------------------------------
48+
49+
Update pdf.js to current version v5.4.394 and replace old version 1.9.426.
50+
51+
I consider this as a security bugfix. Thats why it targets 8.3.
52+
53+
* Fixes: `#5684 <https://github.com/neos/neos-development-collection/issues/5684>`_
54+
55+
* Packages: ``Neos`` ``Media.Browser``
56+
57+
`Detailed log <https://github.com/neos/neos-development-collection/compare/8.3.29...8.3.30>`_
58+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

0 commit comments

Comments
 (0)