diff --git a/lib/foldermanagement/compressionArchiveUtil.inc.php b/lib/foldermanagement/compressionArchiveUtil.inc.php index bddf3cf..5801826 100644 --- a/lib/foldermanagement/compressionArchiveUtil.inc.php +++ b/lib/foldermanagement/compressionArchiveUtil.inc.php @@ -668,9 +668,10 @@ class DownloadQueue * * @param unknown_type $zip * @param unknown_type $docId + * @param boolean $alerts * @return unknown */ - public function addDocument(&$zip, $docId) + public function addDocument(&$zip, $docId, $alerts = true) { $oDocument = Document::get($docId); @@ -685,7 +686,7 @@ class DownloadQueue } // fire subscription alerts for the downloaded document - if global config is set - if($this->bNotifications){ + if($this->bNotifications && $alerts){ $oSubscriptionEvent = new SubscriptionEvent(); $oFolder = Folder::get($oDocument->getFolderID()); $oSubscriptionEvent->DownloadDocument($oDocument, $oFolder); diff --git a/plugins/ktcore/KTBulkActions.php b/plugins/ktcore/KTBulkActions.php index a022d00..79a1682 100644 --- a/plugins/ktcore/KTBulkActions.php +++ b/plugins/ktcore/KTBulkActions.php @@ -1197,7 +1197,6 @@ class KTBrowseBulkExportAction extends KTBulkAction { * */ function perform_action($oEntity) { - // TODO find a way to do bulk email $exportCode = $_SESSION['exportcode']; $this->oZip = ZipFolder::get($exportCode); @@ -1216,7 +1215,7 @@ class KTBrowseBulkExportAction extends KTBulkAction { if($useQueue){ DownloadQueue::addItem($this->sExportCode, $this->oFolder->getId(), $oDocument->iId, 'document'); }else{ - $oQueue->addDocument($this->oZip, $oDocument->iId); + $oQueue->addDocument($this->oZip, $oDocument->iId, false); }