Fire the 'run' GC event before deleting orphaned revisions

Fixes #14309
craftcms · May 13, 2024 · 7723ede · 7723ede
1 parent 6aeb5a9
commit 7723ede
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Fixed a SQL error that could occur when applying or rebuilding the project config.
 - Fixed a bug where adjacent selected table rows were getting extra spacing in Firefox.
+- Fixed a SQL error that could occur when creating revisions after garbage collection was run. ([#14309](https://github.com/craftcms/cms/issues/14309))
 
 ## 4.9.2 - 2024-05-07
 

diff --git a/src/services/Gc.php b/src/services/Gc.php
@@ -133,16 +133,18 @@ public function run(bool $force = false): void
 
         $this->_deleteUnsupportedSiteEntries();
 
-        $this->_deleteOrphanedDraftsAndRevisions();
-        $this->_deleteOrphanedSearchIndexes();
-        $this->_deleteOrphanedRelations();
-        $this->_deleteOrphanedStructureElements();
-
         // Fire a 'run' event
+        // Note this should get fired *before* orphaned drafts & revisions are deleted
+        // (see https://github.com/craftcms/cms/issues/14309)
         if ($this->hasEventHandlers(self::EVENT_RUN)) {
             $this->trigger(self::EVENT_RUN);
         }
 
+        $this->_deleteOrphanedDraftsAndRevisions();
+        $this->_deleteOrphanedSearchIndexes();
+        $this->_deleteOrphanedRelations();
+        $this->_deleteOrphanedStructureElements();
+
         $this->hardDelete([
             Table::STRUCTURES,
             Table::FIELDLAYOUTS,