Commit cdf2eb47dad6f837e427322fad38635a8f245b79
1 parent
8491d5a7
remove ie download hack
added on no comment git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2160 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
10 additions
and
7 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryUI.inc
| @@ -52,24 +52,27 @@ function getDocumentHistory($iDocumentID) { | @@ -52,24 +52,27 @@ function getDocumentHistory($iDocumentID) { | ||
| 52 | $i = 0; | 52 | $i = 0; |
| 53 | while ($sql->next_record()) { | 53 | while ($sql->next_record()) { |
| 54 | if ($sql->f("transaction_name") == "Check Out") { | 54 | if ($sql->f("transaction_name") == "Check Out") { |
| 55 | - // IE ssl download hack- don't use ssl to download | ||
| 56 | - if ($default->phpSniff->property("browser") == "ie") { | ||
| 57 | - $sVersion = "<a href=\"http://" . $default->serverName . "$default->rootUrl/control.php?action=viewDocument&fDocumentID=$iDocumentID&fForDownload=1&fVersion=" . $sql->f("version") . "\">" . $sql->f("version") . "</a>"; | ||
| 58 | - } else { | ||
| 59 | - $sVersion = generateControllerLink("viewDocument", "fDocumentID=$iDocumentID&fForDownload=1&fVersion=" . $sql->f("version"), "<strong>" . $sql->f("version") . "</strong>"); | ||
| 60 | - } | 55 | + $sVersion = generateControllerLink("viewDocument", "fDocumentID=$iDocumentID&fForDownload=1&fVersion=" . $sql->f("version"), "<strong>" . $sql->f("version") . "</strong>"); |
| 61 | } else { | 56 | } else { |
| 62 | $sVersion = $sql->f("version"); | 57 | $sVersion = $sql->f("version"); |
| 63 | } | 58 | } |
| 64 | $sToRender .= "<tr bgcolor=\"" . getColour($i++) . "\">\n"; | 59 | $sToRender .= "<tr bgcolor=\"" . getColour($i++) . "\">\n"; |
| 65 | $sToRender .= "<td>" . $sql->f("transaction_name") . "</td><td>" . $sql->f("user_name") . "</td><td>$sVersion</td>\n"; | 60 | $sToRender .= "<td>" . $sql->f("transaction_name") . "</td><td>" . $sql->f("user_name") . "</td><td>$sVersion</td>\n"; |
| 66 | - $sToRender .= "<td>" . $sql->f("comment") . "</td><td>" . $sql->f("datetime") . "</td></tr>\n"; | 61 | + $sToRender .= "<td>" . displaySpace($sql->f("comment")) . "</td><td>" . $sql->f("datetime") . "</td></tr>\n"; |
| 67 | } | 62 | } |
| 68 | $sToRender .= "</table>\n"; | 63 | $sToRender .= "</table>\n"; |
| 69 | } | 64 | } |
| 70 | return $sToRender; | 65 | return $sToRender; |
| 71 | } | 66 | } |
| 72 | 67 | ||
| 68 | +function displaySpace($sHtml) { | ||
| 69 | + if ($sHtml == "") { | ||
| 70 | + return " "; | ||
| 71 | + } else { | ||
| 72 | + return $sHtml; | ||
| 73 | + } | ||
| 74 | +} | ||
| 75 | + | ||
| 73 | function getPage($iDocumentID, $iFolderID, $sDocumentName) { | 76 | function getPage($iDocumentID, $iFolderID, $sDocumentName) { |
| 74 | global $default; | 77 | global $default; |
| 75 | $sToRender = renderHeading("Document History"); | 78 | $sToRender = renderHeading("Document History"); |