Merge pull request #807 from pradpnayak/CRM-12665

[civicrm-core.git] / CRM / Core / Page / File.php

diff --git a/CRM/Core/Page/File.php b/CRM/Core/Page/File.php
index 51a64dedcce0597ce9892191ea78f9e16d6e3697..78a342be4266777e21cfa016df518600f880430b 100644 (file)
--- a/CRM/Core/Page/File.php
+++ b/CRM/Core/Page/File.php
@@ -53,20 +53,17 @@ class CRM_Core_Page_File extends CRM_Core_Page {
 
     if ($action & CRM_Core_Action::DELETE) {
       if (CRM_Utils_Request::retrieve('confirmed', 'Boolean', CRM_Core_DAO::$_nullObject)) {
-        CRM_Core_BAO_File::delete($id, $eid, $fid);
+        CRM_Core_BAO_File::deleteFileReferences($id, $eid, $fid);
         CRM_Core_Session::setStatus(ts('The attached file has been deleted.'), ts('Complete'), 'success');
 
         $session = CRM_Core_Session::singleton();
         $toUrl = $session->popUserContext();
         CRM_Utils_System::redirect($toUrl);
       }
-      else {
-        $wrapper = new CRM_Utils_Wrapper();
-        return $wrapper->run('CRM_Custom_Form_DeleteFile', ts('Domain Information Page'), NULL);
-      }
     }
     else {
-      CRM_Utils_System::download(CRM_Utils_File::cleanFileName(basename($path)),
+      CRM_Utils_System::download(
+        CRM_Utils_File::cleanFileName(basename($path)),
         $mimeType,
         $buffer
       );