From 4d66e906c83816a7e354a1a255d4a5a5f14ab3b3 Mon Sep 17 00:00:00 2001
From: i-just <iwona@pixelandtonic.com>
Date: Tue, 21 Jul 2026 10:25:44 +0200
Subject: [PATCH 1/2] 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 <iwona@pixelandtonic.com>
Date: Tue, 21 Jul 2026 10:36:40 +0200
Subject: [PATCH 2/2] 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 {