From 467f07adf92ad5f15eb3af574e3c517f89dfd907 Mon Sep 17 00:00:00 2001
From: kevin_fourie <kevin_fourie@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Tue, 7 Oct 2008 15:56:13 +0000
Subject: [PATCH] Merged in...

---
 lib/documentmanagement/documentutil.inc.php       |  9 ++++++++-
 templates/ktcore/document/metadata_history.smarty |  4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/documentmanagement/documentutil.inc.php b/lib/documentmanagement/documentutil.inc.php
index 92690b3..c1d2e8a 100644
--- a/lib/documentmanagement/documentutil.inc.php
+++ b/lib/documentmanagement/documentutil.inc.php
@@ -1312,10 +1312,17 @@ $sourceDocument->getName(),
         $oContentVersion = KTDocumentContentVersion::get($iContentId);
 
         if (PEAR::isError($oContentVersion) || ($oContentVersion == false)) {
-            DBUtil::rollback();
             return PEAR::raiseError(_kt('Invalid document content version object.'));
         }
 
+        // Check that the document content is not the same as the current content version
+        $sDocStoragePath = $oDocument->getStoragePath();
+        $sVersionStoragePath = $oContentVersion->getStoragePath();
+
+        if($sDocStoragePath == $sVersionStoragePath){
+            return PEAR::raiseError(_kt("Can't delete version: content is the same as the current document content."));
+        }
+
         DBUtil::startTransaction();
 
         // now delete the document version
diff --git a/templates/ktcore/document/metadata_history.smarty b/templates/ktcore/document/metadata_history.smarty
index 1bceca5..502e4ac 100644
--- a/templates/ktcore/document/metadata_history.smarty
+++ b/templates/ktcore/document/metadata_history.smarty
@@ -69,14 +69,14 @@
                 <td class="versiondate">{$oVersion->getVersionCreated()}</td>
                 {if $showdelete}
                     <td class="deleteversion">
-                        {if ($document->getMetadataVersion() != $oVersion->getMetadataVersion())}
+                        {if ($document->getMetadataVersion() != $oVersion->getMetadataVersion() & $document->getStoragePath() != $oVersion->getStoragePath())}
                             {if ($oVersion->getMetadataStatusID() == VERSION_DELETED)}
                                 <strong>{i18n}Version deleted{/i18n}</strong>
                             {else}
                                 <a href="{addQS}action=confirmdeleteVersion&fDocumentId={$document->getId()}&version={$oVersion->getCurrentMetadataVersionId()}{/addQS}">{i18n}delete version{/i18n}</a>
                             {/if}
                         {else}
-                            &nbsp;
+                            &mdash;
                         {/if}
                     </td>
                 {/if}
--
libgit2 0.21.4