From b8480c16b9f7b49233fce976485d7493dbeb5003 Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Mon, 2 Sep 2024 10:22:51 +0200 Subject: [PATCH 1/2] 2161: Added patch making https default on CKEditor 5 links --- CHANGELOG.md | 2 ++ composer.json | 3 ++- .../core/ckeditor_5_link_default_https.patch | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 patches/drupal/core/ckeditor_5_link_default_https.patch diff --git a/CHANGELOG.md b/CHANGELOG.md index bbc8dfb8..dfa4d0a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ Nedenfor ses dato for release og beskrivelse af opgaver som er implementeret. ## [Under udvikling] +* CKEditor 5 link standard `https` protocol. + ## [2.8.1] 2024-08-26 * Oprydning af konfiguration. diff --git a/composer.json b/composer.json index f895b6c1..d94738ec 100644 --- a/composer.json +++ b/composer.json @@ -134,7 +134,8 @@ "Set to support. Checkbox condition fixes": "https://raw.githubusercontent.com/OS2Forms/os2forms8/master/patches/setto-and-checkboxes-condition-fix-onlyD7.patch" }, "drupal/core": { - "Allow site install with profile containing hook_install (https://www.drupal.org/project/drupal/issues/2982052)": "https://www.drupal.org/files/issues/2022-05-19/2982052-80.patch" + "Allow site install with profile containing hook_install (https://www.drupal.org/project/drupal/issues/2982052)": "https://www.drupal.org/files/issues/2022-05-19/2982052-80.patch", + "CKEditor 5 link default protocol https": "patches/drupal/core/ckeditor_5_link_default_https.patch" }, "drupal/openid_connect": { "Revoking group access does not reflect on applied roles (https://www.drupal.org/project/openid_connect/issues/3224128)": "https://git.drupalcode.org/project/openid_connect/-/merge_requests/31.diff" diff --git a/patches/drupal/core/ckeditor_5_link_default_https.patch b/patches/drupal/core/ckeditor_5_link_default_https.patch new file mode 100644 index 00000000..ded70213 --- /dev/null +++ b/patches/drupal/core/ckeditor_5_link_default_https.patch @@ -0,0 +1,15 @@ +diff --git a/core/modules/ckeditor5/ckeditor5.ckeditor5.yml b/core/modules/ckeditor5/ckeditor5.ckeditor5.yml +index 0a19bdca90..140412e714 100644 +--- a/core/modules/ckeditor5/ckeditor5.ckeditor5.yml ++++ b/core/modules/ckeditor5/ckeditor5.ckeditor5.yml +@@ -328,6 +328,10 @@ ckeditor5_link: + ckeditor5: + plugins: + - link.Link ++ config: ++ link: ++ # @see https://ckeditor.com/docs/ckeditor5/latest/features/link.html#adding-default-link-protocol-to-external-links ++ defaultProtocol: 'https://' + drupal: + label: Link + library: core/ckeditor5.link From c76731ba6889f74cd73eb125442369ad21530b03 Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Mon, 2 Sep 2024 10:40:16 +0200 Subject: [PATCH 2/2] 2161: Update composer.lock --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 2f12d447..b2c34876 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c3736315ed29e65c0a492c205da805d6", + "content-hash": "770524fd887e3aa36cd20fc22a7c0e9e", "packages": [ { "name": "asm89/stack-cors", @@ -1963,7 +1963,7 @@ "homepage": "https://www.drupal.org/user/1305230" }, { - "name": "Dave Reid", + "name": "dave reid", "homepage": "https://www.drupal.org/user/53892" }, {