[6.0] Remaining fixes for Version History (#46276)

Author: joomdonation

libraries/src/MVC/Model/AdminModel.php

@@ -936,6 +936,12 @@ public function delete(&$pks)
                         return false;
                     }
 
+                    if ($this instanceof VersionableModelInterface) {
+                        $typeAlias = $this->typeAlias ?: $this->option . '.' . $this->name;
+
+                        $this->deleteHistory($typeAlias, $pk);
+                    }
+
                     // Trigger the after event.
                     $dispatcher->dispatch($this->event_after_delete, new Model\AfterDeleteEvent($this->event_after_delete, [
                         'context' => $context,

libraries/src/Versioning/VersionableModelInterface.php

@@ -43,4 +43,16 @@ public function loadHistory(int $historyId);
      * @since   6.0.0
      */
     public function saveHistory(array $data, string $context);
+
+    /**
+     * Method to delete the history for an item.
+     *
+     * @param   string   $typeAlias  Typealias of the content type
+     * @param   integer  $id         ID of the content item to delete
+     *
+     * @return  boolean  true on success, otherwise false.
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function deleteHistory($typeAlias, $id);
 }

libraries/src/Versioning/VersionableModelTrait.php

@@ -299,6 +299,10 @@ public function setConvertToInt(array $convertToInt): void
      */
     public function saveHistory(array $data, string $context)
     {
+        if (!$this->versionHistoryEnabled($context)) {
+            return false;
+        }
+
         $id = $this->getState($this->getName() . '.id');
 
         /**
@@ -470,4 +474,20 @@ protected function markVersionAsCurrent(int $versionId, string $itemId): void
         $db->setQuery($query);
         $db->execute();
     }
+
+    /**
+     * Method to check if version history is enabled for a specific context.
+     *
+     * @param   string  $context  The model context.
+     *
+     * @return  boolean  True if version history is enabled, false otherwise.
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    protected function versionHistoryEnabled(string $context): bool
+    {
+        [$extension, $type] = explode('.', $context);
+
+        return (bool) ComponentHelper::getParams($extension)->get('save_history', 0);
+    }
 }