diff --git a/composer.lock b/composer.lock index 0c1fe6dc8..9db0e00bd 100644 --- a/composer.lock +++ b/composer.lock @@ -64,16 +64,16 @@ }, { "name": "caxy/php-htmldiff", - "version": "v0.1.14", + "version": "v0.1.15", "source": { "type": "git", "url": "https://github.com/caxy/php-htmldiff.git", - "reference": "3f8ee7edda3d7c6d2e58a02d70a12d3242c84ea5" + "reference": "6342b02ddb86fd36093ad7e2db2efc21f01ab7cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/caxy/php-htmldiff/zipball/3f8ee7edda3d7c6d2e58a02d70a12d3242c84ea5", - "reference": "3f8ee7edda3d7c6d2e58a02d70a12d3242c84ea5", + "url": "https://api.github.com/repos/caxy/php-htmldiff/zipball/6342b02ddb86fd36093ad7e2db2efc21f01ab7cd", + "reference": "6342b02ddb86fd36093ad7e2db2efc21f01ab7cd", "shasum": "" }, "require": { @@ -119,9 +119,9 @@ ], "support": { "issues": "https://github.com/caxy/php-htmldiff/issues", - "source": "https://github.com/caxy/php-htmldiff/tree/v0.1.14" + "source": "https://github.com/caxy/php-htmldiff/tree/v0.1.15" }, - "time": "2022-01-19T11:09:59+00:00" + "time": "2023-11-05T23:49:04+00:00" }, { "name": "chi-teck/drupal-code-generator", @@ -1789,17 +1789,17 @@ }, { "name": "drupal/config_filter", - "version": "2.5.0", + "version": "2.6.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/config_filter.git", - "reference": "8.x-2.5" + "reference": "8.x-2.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/config_filter-8.x-2.5.zip", - "reference": "8.x-2.5", - "shasum": "a509ec432b0560fbba853b52e74d71cede5f6bdf" + "url": "https://ftp.drupal.org/files/projects/config_filter-8.x-2.6.zip", + "reference": "8.x-2.6", + "shasum": "fd1a057a402436fc906c63bf0a74722f73b9b155" }, "require": { "drupal/core": "^8.8 || ^9 || ^10" @@ -1813,8 +1813,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.5", - "datestamp": "1698096457", + "version": "8.x-2.6", + "datestamp": "1698308577", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3751,16 +3751,16 @@ }, { "name": "drupal/hdbt", - "version": "5.6.23", + "version": "5.6.25", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "e3d59c7b07f051da0a2f9d3cc0708137c5d72264" + "reference": "09c80a3399d9319f1dfb837e190113f0a6c6effb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/e3d59c7b07f051da0a2f9d3cc0708137c5d72264", - "reference": "e3d59c7b07f051da0a2f9d3cc0708137c5d72264", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/09c80a3399d9319f1dfb837e190113f0a6c6effb", + "reference": "09c80a3399d9319f1dfb837e190113f0a6c6effb", "shasum": "" }, "require": { @@ -3778,10 +3778,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.23", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.25", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-10-24T11:50:11+00:00" + "time": "2023-10-30T12:30:23+00:00" }, { "name": "drupal/hdbt_admin", @@ -3870,16 +3870,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.5.8", + "version": "2.5.11", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "c8ed69e045bae960fff5b71179d09f62ea53651a" + "reference": "cd300f71fcf464111636eec7c1da7f4bc855f772" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/c8ed69e045bae960fff5b71179d09f62ea53651a", - "reference": "c8ed69e045bae960fff5b71179d09f62ea53651a", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/cd300f71fcf464111636eec7c1da7f4bc855f772", + "reference": "cd300f71fcf464111636eec7c1da7f4bc855f772", "shasum": "" }, "require": { @@ -3889,13 +3889,15 @@ "firebase/php-jwt": "^6.5", "php": "^8.1", "t4web/composer-lock-parser": "^1.0", - "textalk/websocket": "^1.6" + "textalk/websocket": "^1.6", + "webmozart/assert": "^1.0" }, "conflict": { "drupal/helfi_debug": "*" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", + "dg/bypass-finals": "^1.0", "donatj/mock-webserver": "dev-master", "drupal/coder": "^8.3" }, @@ -3905,10 +3907,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.8", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.11", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2023-10-18T05:44:50+00:00" + "time": "2023-11-06T08:22:25+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -3955,12 +3957,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "3f74602477470e7220c12e0304d291f2504ad2ba" + "reference": "f063599143079b099b49e613eb7691662958a3b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/3f74602477470e7220c12e0304d291f2504ad2ba", - "reference": "3f74602477470e7220c12e0304d291f2504ad2ba", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/f063599143079b099b49e613eb7691662958a3b1", + "reference": "f063599143079b099b49e613eb7691662958a3b1", "shasum": "" }, "require": { @@ -3998,7 +4000,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2023-10-25T07:38:01+00:00" + "time": "2023-10-27T06:16:44+00:00" }, { "name": "drupal/helfi_navigation", @@ -4037,16 +4039,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.4.32", + "version": "3.4.37", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "3fc6a55c3e54e0fcc83971bef6b8cd108aa59a7d" + "reference": "97707c1a7b6b92e1855594c15312e7dbb9a6a9fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/3fc6a55c3e54e0fcc83971bef6b8cd108aa59a7d", - "reference": "3fc6a55c3e54e0fcc83971bef6b8cd108aa59a7d", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/97707c1a7b6b92e1855594c15312e7dbb9a6a9fb", + "reference": "97707c1a7b6b92e1855594c15312e7dbb9a6a9fb", "shasum": "" }, "require": { @@ -4142,7 +4144,7 @@ "Add missing schema to social media. (https://www.drupal.org/project/social_media/issues/2986819)": "https://git.drupalcode.org/project/social_media/-/commit/1964f42e5a6fb5d7a97fdf8ec5ca259bc6c5b19a.patch" }, "drupal/simple_sitemap": { - "[#UHF-8514] Fix frontpage URLs in sitemap. (https://www.drupal.org/project/simple_sitemap/issues/3264573)": "https://www.drupal.org/files/issues/2022-02-15/3264573-2.patch" + "[#UHF-8514] Fix frontpage URLs in sitemap. (https://www.drupal.org/i/3264573)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/55722f695264bbaf6062f46e400e905c761fd5b7/patches/simple_sitemap-3264573-respect-frontpage-configuration.patch" } } }, @@ -4151,10 +4153,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.32", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.37", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-10-24T19:15:05+00:00" + "time": "2023-11-07T05:48:17+00:00" }, { "name": "drupal/helfi_proxy", @@ -4202,16 +4204,16 @@ }, { "name": "drupal/helfi_tpr", - "version": "2.2.8", + "version": "2.2.10", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "96e148e1e18bf62bc592ee30f65bfe360b3d2396" + "reference": "a562d26f7c8eb866455be49dc6ec767edff2c263" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/96e148e1e18bf62bc592ee30f65bfe360b3d2396", - "reference": "96e148e1e18bf62bc592ee30f65bfe360b3d2396", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/a562d26f7c8eb866455be49dc6ec767edff2c263", + "reference": "a562d26f7c8eb866455be49dc6ec767edff2c263", "shasum": "" }, "require": { @@ -4237,10 +4239,10 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.2.8", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.2.10", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2023-10-13T10:43:12+00:00" + "time": "2023-11-02T10:54:20+00:00" }, { "name": "drupal/helfi_tunnistamo", @@ -4721,6 +4723,10 @@ { "name": "bkosborne", "homepage": "https://www.drupal.org/user/788032" + }, + { + "name": "joevagyok", + "homepage": "https://www.drupal.org/user/2876343" } ], "description": "Allows content editors to easily replace source files associated with any file-based media entity, preserving the original filename.", @@ -5848,17 +5854,17 @@ }, { "name": "drupal/simple_sitemap", - "version": "4.1.6", + "version": "4.1.7", "source": { "type": "git", "url": "https://git.drupalcode.org/project/simple_sitemap.git", - "reference": "4.1.6" + "reference": "4.1.7" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/simple_sitemap-4.1.6.zip", - "reference": "4.1.6", - "shasum": "5ea5ee97ab4d59b43db86dd6279c3ac5ecbe69b9" + "url": "https://ftp.drupal.org/files/projects/simple_sitemap-4.1.7.zip", + "reference": "4.1.7", + "shasum": "3d55ee386b0ebb81ed4c3461451a9e32a15d93d7" }, "require": { "drupal/core": "^9.3 || ^10", @@ -5867,8 +5873,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.1.6", - "datestamp": "1686288643", + "version": "4.1.7", + "datestamp": "1698936269", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/conf/cmi/core.entity_form_display.paragraph.remote_video.default.yml b/conf/cmi/core.entity_form_display.paragraph.remote_video.default.yml index 570e9ab26..e1d4a13a6 100644 --- a/conf/cmi/core.entity_form_display.paragraph.remote_video.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.remote_video.default.yml @@ -13,6 +13,8 @@ dependencies: module: - media_library - text +_core: + default_config_hash: AMDZDzWNP90sUgt9bSZf2RbL7KmSxkXMKIiueo1JSWg id: paragraph.remote_video.default targetEntityType: paragraph bundle: remote_video diff --git a/conf/cmi/core.entity_view_display.paragraph.remote_video.default.yml b/conf/cmi/core.entity_view_display.paragraph.remote_video.default.yml index ffefdd508..745d0e287 100644 --- a/conf/cmi/core.entity_view_display.paragraph.remote_video.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.remote_video.default.yml @@ -12,6 +12,8 @@ dependencies: - paragraphs.paragraphs_type.remote_video module: - text +_core: + default_config_hash: hYT61xkhP2zXO2VXijtXVPkoENlhLvIv5DRycKMm6iE id: paragraph.remote_video.default targetEntityType: paragraph bundle: remote_video diff --git a/conf/cmi/field.field.paragraph.remote_video.field_iframe_title.yml b/conf/cmi/field.field.paragraph.remote_video.field_iframe_title.yml index a7fbf3f0d..0021fb399 100644 --- a/conf/cmi/field.field.paragraph.remote_video.field_iframe_title.yml +++ b/conf/cmi/field.field.paragraph.remote_video.field_iframe_title.yml @@ -5,12 +5,14 @@ dependencies: config: - field.storage.paragraph.field_iframe_title - paragraphs.paragraphs_type.remote_video +_core: + default_config_hash: 4JZoeG_XitvgE9Tg7ZfVUwjpWcjeqktlO2tOnx_WfWU id: paragraph.remote_video.field_iframe_title field_name: field_iframe_title entity_type: paragraph bundle: remote_video label: 'Assistive technology title' -description: 'Users of assistive technology need a descriptive title to know what is in the embedded content.' +description: 'Users of assistive technology need a descriptive title to know what is in the embedded content. Do not use the prefix "Video: ". It will be added automatically.' required: true translatable: true default_value: { } diff --git a/conf/cmi/field.field.paragraph.remote_video.field_remote_video.yml b/conf/cmi/field.field.paragraph.remote_video.field_remote_video.yml index 589d6e31c..197619b45 100644 --- a/conf/cmi/field.field.paragraph.remote_video.field_remote_video.yml +++ b/conf/cmi/field.field.paragraph.remote_video.field_remote_video.yml @@ -6,6 +6,8 @@ dependencies: - field.storage.paragraph.field_remote_video - media.type.remote_video - paragraphs.paragraphs_type.remote_video +_core: + default_config_hash: Fic2VdL-ZETniu6G6WMkjo6q6P2QhttP4fv8UUwGSR0 id: paragraph.remote_video.field_remote_video field_name: field_remote_video entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.remote_video.field_remote_video_description.yml b/conf/cmi/field.field.paragraph.remote_video.field_remote_video_description.yml index 884723c71..7a54dde25 100644 --- a/conf/cmi/field.field.paragraph.remote_video.field_remote_video_description.yml +++ b/conf/cmi/field.field.paragraph.remote_video.field_remote_video_description.yml @@ -11,6 +11,8 @@ dependencies: third_party_settings: allowed_formats: allowed_formats: { } +_core: + default_config_hash: emEHEeE_yt_Z5EVGuPcPk9m--eTj8gCieN9Gzw08GLU id: paragraph.remote_video.field_remote_video_description field_name: field_remote_video_description entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.remote_video.field_remote_video_title.yml b/conf/cmi/field.field.paragraph.remote_video.field_remote_video_title.yml index c3644f810..2b88fe7cc 100644 --- a/conf/cmi/field.field.paragraph.remote_video.field_remote_video_title.yml +++ b/conf/cmi/field.field.paragraph.remote_video.field_remote_video_title.yml @@ -5,6 +5,8 @@ dependencies: config: - field.storage.paragraph.field_remote_video_title - paragraphs.paragraphs_type.remote_video +_core: + default_config_hash: Kn3u7ICuSPlxFZiNdYRyNxEnd-I9Yye00bz2l39BXFQ id: paragraph.remote_video.field_remote_video_title field_name: field_remote_video_title entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.remote_video.field_remote_video_video_desc.yml b/conf/cmi/field.field.paragraph.remote_video.field_remote_video_video_desc.yml index a562b86cd..030933a9d 100644 --- a/conf/cmi/field.field.paragraph.remote_video.field_remote_video_video_desc.yml +++ b/conf/cmi/field.field.paragraph.remote_video.field_remote_video_video_desc.yml @@ -11,6 +11,8 @@ dependencies: third_party_settings: allowed_formats: allowed_formats: { } +_core: + default_config_hash: Zv-7KNCky603k38t9PbBgreu9IPTSpVw-bLEa3ptVlE id: paragraph.remote_video.field_remote_video_video_desc field_name: field_remote_video_video_desc entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.remote_video.field_remote_video_video_title.yml b/conf/cmi/field.field.paragraph.remote_video.field_remote_video_video_title.yml index b7d074946..d05d80e92 100644 --- a/conf/cmi/field.field.paragraph.remote_video.field_remote_video_video_title.yml +++ b/conf/cmi/field.field.paragraph.remote_video.field_remote_video_video_title.yml @@ -5,6 +5,8 @@ dependencies: config: - field.storage.paragraph.field_remote_video_video_title - paragraphs.paragraphs_type.remote_video +_core: + default_config_hash: Bp1tvXNbkNozGjMop7bTopoVYSimcgFctt5eELalVbY id: paragraph.remote_video.field_remote_video_video_title field_name: field_remote_video_video_title entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_remote_video.yml b/conf/cmi/field.storage.paragraph.field_remote_video.yml index 40e09a8a2..3b2510c22 100644 --- a/conf/cmi/field.storage.paragraph.field_remote_video.yml +++ b/conf/cmi/field.storage.paragraph.field_remote_video.yml @@ -5,6 +5,8 @@ dependencies: module: - media - paragraphs +_core: + default_config_hash: Bh7n9tsOmq_MtUy_bjD_jxqlduNcg-6UJvy4_r4txc8 id: paragraph.field_remote_video field_name: field_remote_video entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_remote_video_description.yml b/conf/cmi/field.storage.paragraph.field_remote_video_description.yml index 981f8fc2a..2e93ed561 100644 --- a/conf/cmi/field.storage.paragraph.field_remote_video_description.yml +++ b/conf/cmi/field.storage.paragraph.field_remote_video_description.yml @@ -5,6 +5,8 @@ dependencies: module: - paragraphs - text +_core: + default_config_hash: cq3pdUIwmiOxVLXVLyNHCrQUxQlsS7rClbJnKKks_JU id: paragraph.field_remote_video_description field_name: field_remote_video_description entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_remote_video_title.yml b/conf/cmi/field.storage.paragraph.field_remote_video_title.yml index bc35d3a3e..333edb267 100644 --- a/conf/cmi/field.storage.paragraph.field_remote_video_title.yml +++ b/conf/cmi/field.storage.paragraph.field_remote_video_title.yml @@ -4,6 +4,8 @@ status: true dependencies: module: - paragraphs +_core: + default_config_hash: 0k4C3yk8Ne0kpMQ0Jc4AD4B3Acm7CQKI_Ug0u-4ZUYE id: paragraph.field_remote_video_title field_name: field_remote_video_title entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_remote_video_video_desc.yml b/conf/cmi/field.storage.paragraph.field_remote_video_video_desc.yml index 7a1f85dc8..b42f9839c 100644 --- a/conf/cmi/field.storage.paragraph.field_remote_video_video_desc.yml +++ b/conf/cmi/field.storage.paragraph.field_remote_video_video_desc.yml @@ -5,6 +5,8 @@ dependencies: module: - paragraphs - text +_core: + default_config_hash: j86-6zpgZg50s_H3TClf9Soi0TR-N1JMtPIEcskvxTo id: paragraph.field_remote_video_video_desc field_name: field_remote_video_video_desc entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_remote_video_video_title.yml b/conf/cmi/field.storage.paragraph.field_remote_video_video_title.yml index 0056dd85f..bd852024e 100644 --- a/conf/cmi/field.storage.paragraph.field_remote_video_video_title.yml +++ b/conf/cmi/field.storage.paragraph.field_remote_video_video_title.yml @@ -4,6 +4,8 @@ status: true dependencies: module: - paragraphs +_core: + default_config_hash: NQK8C_re4avi5sgPKbEZUF-Pb5ZV05qUxasNqGulkBU id: paragraph.field_remote_video_video_title field_name: field_remote_video_video_title entity_type: paragraph diff --git a/conf/cmi/language/fi/field.field.paragraph.remote_video.field_iframe_title.yml b/conf/cmi/language/fi/field.field.paragraph.remote_video.field_iframe_title.yml index 36c9ed0e8..ca8475b71 100644 --- a/conf/cmi/language/fi/field.field.paragraph.remote_video.field_iframe_title.yml +++ b/conf/cmi/language/fi/field.field.paragraph.remote_video.field_iframe_title.yml @@ -1,2 +1,2 @@ label: 'Avustavan teknologian otsikko' -description: 'Avustavan teknologian käyttäjät tarvitsevat kuvaavan otsikon upotetulle sisällölle.' +description: 'Avustavan teknologian käyttäjät tarvitsevat kuvaavan otsikon upotetulle sisällölle. Älä käytä etuliitettä "Video: ". Se lisätään automaattisesti.' diff --git a/conf/cmi/language/sv/field.field.paragraph.remote_video.field_iframe_title.yml b/conf/cmi/language/sv/field.field.paragraph.remote_video.field_iframe_title.yml index 80a22d2bb..34cc701df 100644 --- a/conf/cmi/language/sv/field.field.paragraph.remote_video.field_iframe_title.yml +++ b/conf/cmi/language/sv/field.field.paragraph.remote_video.field_iframe_title.yml @@ -1,2 +1,2 @@ label: 'Hjälpmedel rubrik' -description: 'Användare av hjälpmedel behöver en beskrivande rubrik för inbäddad innehåll.' +description: 'Användare av hjälpmedel behöver en beskrivande rubrik för inbäddad innehåll. Använd inte prefixet "Video: ". Den läggs till automatiskt.' diff --git a/conf/cmi/paragraphs.paragraphs_type.remote_video.yml b/conf/cmi/paragraphs.paragraphs_type.remote_video.yml index a62247a96..c50c4e76f 100644 --- a/conf/cmi/paragraphs.paragraphs_type.remote_video.yml +++ b/conf/cmi/paragraphs.paragraphs_type.remote_video.yml @@ -2,6 +2,8 @@ uuid: 05e510bc-6251-4934-937f-e556b11481c8 langcode: en status: true dependencies: { } +_core: + default_config_hash: WTAPpeTZCHB5rS01AM02G5tEkQ7LMFLOfPD-MW0Hir4 id: remote_video label: 'Remote video' icon_uuid: null diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml index 6c486770e..5b6ba0009 100644 --- a/conf/cmi/views.view.service_list.yml +++ b/conf/cmi/views.view.service_list.yml @@ -360,13 +360,13 @@ display: display_plugin: block position: 1 display_options: - display_extenders: { } pager: type: none options: offset: 0 defaults: pager: false + display_extenders: { } cache_metadata: max-age: -1 contexts: diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php index 442df2758..21ada2e4a 100755 --- a/public/sites/default/settings.php +++ b/public/sites/default/settings.php @@ -121,7 +121,7 @@ function drupal_get_env(string|array $variables) : mixed { } $settings['reverse_proxy'] = TRUE; $settings['reverse_proxy_addresses'] = $reverse_proxy_address; - $settings['reverse_proxy_trusted_headers'] = Request::HEADER_X_FORWARDED_ALL; + $settings['reverse_proxy_trusted_headers'] = Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO; $settings['reverse_proxy_host_header'] = 'X_FORWARDED_HOST'; }