From 5762353aacf4cbd9ceefc2126f4bf4acad8a9355 Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Tue, 30 Jun 2020 16:58:43 +0530
Subject: [PATCH] Fixes file preview in ModComments - Review Addressed

---
 packages/vtiger/optional/ModComments.zip      | Bin 38734 -> 38701 bytes
 .../modules/ModComments/views/FilePreview.php |   6 +-----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/vtiger/optional/ModComments.zip b/packages/vtiger/optional/ModComments.zip
index d8bf00828de3834f7b04a685510cc41be2f81b99..33280966ae000302cdeef8daffc14d370c7e84cb 100644
GIT binary patch
delta 2684
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
Wgi$YZiN6kz!1gSZkV+!&RPjG|pvUL{

delta 2738
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
IWzQpj10-fJBLDyZ

diff --git a/pkg/vtiger/modules/ModComments/modules/ModComments/views/FilePreview.php b/pkg/vtiger/modules/ModComments/modules/ModComments/views/FilePreview.php
index 1d058387c..154401615 100644
--- a/pkg/vtiger/modules/ModComments/modules/ModComments/views/FilePreview.php
+++ b/pkg/vtiger/modules/ModComments/modules/ModComments/views/FilePreview.php
@@ -48,15 +48,12 @@ class ModComments_FilePreview_View extends Vtiger_IndexAjax_View {
 			}
 		}
 
-		$path = $fileDetails['path'].$fileDetails['attachmentsid'].'_'.$storedFileName;
 		$type = $fileDetails['type'];
 		$contents = $fileContent;
 		$filename = $fileDetails['name'];
 		$parts = explode('.', $filename);
 		if ($recordModel->get('filename')) {
-			$fileDetails = $recordModel->getFileNameAndDownloadURL($recordId, $attachmentId);
-		}
-                if ($recordModel->get('filename')) {
+                    $fileDetails = $recordModel->getFileNameAndDownloadURL($recordId, $attachmentId);
                     $downloadUrl =  $recordModel->getDownloadFileURL($attachmentId);
                     $trimmedFileName = $fileDetails[0]['trimmedFileName'];
                 }
@@ -85,7 +82,6 @@ class ModComments_FilePreview_View extends Vtiger_IndexAjax_View {
 			$viewer->assign('FILE_PREVIEW_NOT_SUPPORTED', 'yes');
 
 		$viewer->assign('DOWNLOAD_URL', $downloadUrl);
-		$viewer->assign('FILE_PATH', $path);
 		$viewer->assign('TRIMMED_FILE_NAME', $trimmedFileName);
 		$viewer->assign('FILE_NAME', $filename);
 		$viewer->assign('FILE_EXTN', $extn);
-- 
GitLab