From cc731404565c2e9d8304cfa5f86e77a3dd19d5bd Mon Sep 17 00:00:00 2001 From: Jacek Foremski Date: Fri, 2 Mar 2018 16:12:19 +0100 Subject: [PATCH 1/2] EZP-28886: Method eZ\Publish\Core\FieldType\Page\Value::__toString() does not always return String (#2265) --- eZ/Publish/Core/FieldType/Page/Value.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eZ/Publish/Core/FieldType/Page/Value.php b/eZ/Publish/Core/FieldType/Page/Value.php index 38831d7405d..4fe6751cd38 100644 --- a/eZ/Publish/Core/FieldType/Page/Value.php +++ b/eZ/Publish/Core/FieldType/Page/Value.php @@ -38,7 +38,7 @@ public function __construct(Page $page = null) public function __toString() { if ($this->page instanceof Page) { - return $this->page->layout; + return (string)$this->page->layout; } return ''; From 5557b7a789aaffbe1a28211fbda03b9e4bf48ec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edi=20Modri=C4=87?= Date: Fri, 2 Mar 2018 16:12:31 +0100 Subject: [PATCH 2/2] EZP-28853: Clear VersionInfo cache in recently added method (#2264) --- eZ/Publish/Core/Persistence/Cache/ContentHandler.php | 1 + 1 file changed, 1 insertion(+) diff --git a/eZ/Publish/Core/Persistence/Cache/ContentHandler.php b/eZ/Publish/Core/Persistence/Cache/ContentHandler.php index 178170ce1ad..3efaaaa5a38 100644 --- a/eZ/Publish/Core/Persistence/Cache/ContentHandler.php +++ b/eZ/Publish/Core/Persistence/Cache/ContentHandler.php @@ -352,6 +352,7 @@ public function deleteTranslationFromDraft($contentId, $versionNo, $languageCode $languageCode ); $this->cache->clear('content', $contentId, $versionNo); + $this->cache->clear('content', 'info', $contentId, 'versioninfo', $versionNo); return $content; }