From 4d66e906c83816a7e354a1a255d4a5a5f14ab3b3 Mon Sep 17 00:00:00 2001 From: i-just Date: Tue, 21 Jul 2026 10:25:44 +0200 Subject: [PATCH 1/3] don't include drafts and revisions in the reference count --- src/deletionblockers/ReferenceDeletionBlocker.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/deletionblockers/ReferenceDeletionBlocker.php b/src/deletionblockers/ReferenceDeletionBlocker.php index 9ed81482..4e1da459 100644 --- a/src/deletionblockers/ReferenceDeletionBlocker.php +++ b/src/deletionblockers/ReferenceDeletionBlocker.php @@ -12,6 +12,7 @@ use craft\base\ElementInterface; use craft\ckeditor\Plugin; use craft\db\Query; +use craft\db\Table; use craft\elements\deletionblockers\BaseDeletionBlocker; use craft\helpers\Html; @@ -26,9 +27,12 @@ public function init() { if (Craft::$app->getDb()->tableExists(Plugin::TABLE_REFERENCES)) { $this->referenceCount = (new Query()) - ->from(Plugin::TABLE_REFERENCES) + ->from(['ckeditor_references' => Plugin::TABLE_REFERENCES]) + ->leftJoin(['elements' => Table::ELEMENTS], '[[elements.id]] = [[ckeditor_references.sourceId]]') ->where([ 'targetId' => $this->elements->ids()->all(), + 'elements.draftId' => null, + 'elements.revisionId' => null ]) ->count(); } else { From cc8db4017ddd2a70c731abd10e541f77206ecc5f Mon Sep 17 00:00:00 2001 From: i-just Date: Tue, 21 Jul 2026 10:36:40 +0200 Subject: [PATCH 2/3] ecs --- src/deletionblockers/ReferenceDeletionBlocker.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/deletionblockers/ReferenceDeletionBlocker.php b/src/deletionblockers/ReferenceDeletionBlocker.php index 4e1da459..9f5fc297 100644 --- a/src/deletionblockers/ReferenceDeletionBlocker.php +++ b/src/deletionblockers/ReferenceDeletionBlocker.php @@ -32,7 +32,7 @@ public function init() ->where([ 'targetId' => $this->elements->ids()->all(), 'elements.draftId' => null, - 'elements.revisionId' => null + 'elements.revisionId' => null, ]) ->count(); } else { From d321a67f704a0a0bbce4d69e1f4b43fcfcfbf686 Mon Sep 17 00:00:00 2001 From: brandonkelly Date: Mon, 10 Aug 2026 09:45:43 -0700 Subject: [PATCH 3/3] Release note --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1a7248c..532fb093 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Fixed a bug where selected image transforms were being forgotten, if the transform changed the file format. ([#588](https://github.com/craftcms/ckeditor/issues/588)) - Fixed a bug where downloadable links’ `download` attributes were sometimes getting set to the value `"true"`. ([#606](https://github.com/craftcms/ckeditor/issues/606)) - Fixed a bug where custom styles weren’t being applied in fullscreen mode. ([#614](https://github.com/craftcms/ckeditor/issues/614)) +- Fixed a bug where entry deletion blockers were factoring in drafts and revisions that referenced the to-be-deleted entry. ([#600](https://github.com/craftcms/ckeditor/issues/600)) ## 5.6.1 - 2026-05-13