diff --git a/composer.json b/composer.json index 653d5159..4dd034cf 100644 --- a/composer.json +++ b/composer.json @@ -28,15 +28,11 @@ "pimcore/ecommerce-framework-bundle": "*", "pimcore/web-to-print-bundle": "*", "pimcore/newsletter-bundle": "*", - "rybakit/twig-deferred-extension": "^3.0", "symfony/runtime": "^6.2", "symfony/intl": "^6.2", "symfony/dotenv": "^6.2", "gotenberg/gotenberg-php": "^1.1 || ^2.0" }, - "conflict": { - "twig/twig": "^3.9.0" - }, "suggest": { "pimcore/elasticsearch-client": "Required for Elastic Search service" }, diff --git a/config/services.yaml b/config/services.yaml index 3ab58bf9..f7b66e32 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -223,8 +223,3 @@ services: arguments: - !service { class: PDO, factory: [ '@database_connection', 'getNativeConnection' ] } - { lock_mode: 0 } - - # the deferred extension is needed for placeholder helpers to work - # as otherwise the placeholder block would be rendered before any - # content was added (e.g. headTitle) - Twig\DeferredExtension\DeferredExtension: ~ diff --git a/templates/areas/wysiwyg-with-images/view.html.twig b/templates/areas/wysiwyg-with-images/view.html.twig index 97df9cc0..96125944 100644 --- a/templates/areas/wysiwyg-with-images/view.html.twig +++ b/templates/areas/wysiwyg-with-images/view.html.twig @@ -2,11 +2,6 @@ {% set content = pimcore_wysiwyg('content') %} -{# add autogenerated meta description #} -{% if document.getDescription() is empty %} - {% do pimcore_head_meta().setDescription(content.getData(), 160) %} -{% endif %} -
diff --git a/templates/areas/wysiwyg/view.html.twig b/templates/areas/wysiwyg/view.html.twig index 70a8682c..c776788e 100644 --- a/templates/areas/wysiwyg/view.html.twig +++ b/templates/areas/wysiwyg/view.html.twig @@ -1,10 +1,5 @@ {% set content = pimcore_wysiwyg('content') %} -{# add autogenerated meta description #} -{% if document.getDescription() is empty %} - {% do pimcore_head_meta().setDescription(content.getData(), 160) %} -{% endif %} -
{% apply pimcore_glossary %} {{ content|raw }} diff --git a/templates/includes/content-headline.html.twig b/templates/includes/content-headline.html.twig index 15e65d6e..1af4f459 100644 --- a/templates/includes/content-headline.html.twig +++ b/templates/includes/content-headline.html.twig @@ -1,5 +1,4 @@ {% set headline = pimcore_input('headline') %} -{% do pimcore_head_title(headline.getData()) %}