From ffa507e80d624f427b32ad2d675706283a481ec6 Mon Sep 17 00:00:00 2001
From: michael <michael@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Tue, 1 Jul 2003 09:39:50 +0000
Subject: [PATCH] corrected checkout / download bug (#2672)

---
 presentation/lookAndFeel/knowledgeTree/documentmanagement/checkOutDocumentUI.inc | 2 +-
 presentation/lookAndFeel/knowledgeTree/documentmanagement/downloadBL.php         | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkOutDocumentUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkOutDocumentUI.inc
index abf786e..3fbd09e 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkOutDocumentUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkOutDocumentUI.inc
@@ -52,7 +52,7 @@ function getCheckOutPage($oDocument, $bCheckedOut = false) {
     if ($bCheckedOut) {
     	$sToRender .= "<table>";
         $sToRender .= "<tr><td>You have now checked out this document. No one else can make updates to the document while you have it checked out. Click the Download button to get the latest version of the file. Please check it back in, as soon as you finish working on it.</td></tr>\n";
-        $sToRender .= "<tr><td><a href=\"$default->rootUrl/control.php?action=viewDocument&fDocumentID=" . $oDocument->getID() . "&fForDownload=1\"><img src=\"$default->graphicsUrl/widgets/download.gif\" border=\"0\" /></a>\n";    
+        $sToRender .= "<tr><td><a href=\"$default->rootUrl/control.php?action=downloadDocument&fDocumentID=" . $oDocument->getID() . "\"><img src=\"$default->graphicsUrl/widgets/download.gif\" border=\"0\" /></a>\n";    
         $sToRender .= "<a href=\"$default->rootUrl/control.php?action=viewDocument&fDocumentID=" . $oDocument->getID() . "\"><img src=\"$default->graphicsUrl/widgets/back.gif\" border=\"0\" /></a></td>\n";
         $sToRender .= "</table>";        
     } else {
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/downloadBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/downloadBL.php
index 9e39088..5004077 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/downloadBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/downloadBL.php
@@ -49,6 +49,11 @@ if (checkSession()) {
 	                $oDocumentTransaction->create();
 	                PhysicalDocumentManager::downloadPhysicalDocument($fDocumentID);
 	            }
+
+	            // optionally redirect to some other page
+//	            if ($fForDownload) {
+//	            	$sOnLoadJs = "redirTimer(0, '" . generateControllerUrl("downloadDocument", "fDocumentID=$fDocumentID") ."');";
+//	            }
 	        }
     	} else {
 	        require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
--
libgit2 0.21.4