diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php index 5664ec40c..67169fb66 100644 --- a/views/bootstrap/class.ObjectCheck.php +++ b/views/bootstrap/class.ObjectCheck.php @@ -91,6 +91,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style { $folder = $this->params['folder']; $repair = $this->params['repair']; $objects = $this->params['repairobjects']; + $conversionmgr = $this->params['conversionmgr']; $cachedir = $this->params['cachedir']; $previewwidth = $this->params['previewWidthList']; $previewconverters = $this->params['previewConverters']; @@ -99,7 +100,10 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style { $this->contentHeading(getMLText("objectcheck")); $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout); - $previewer->setConverters($previewconverters); + if($conversionmgr) + $previewer->setConversionMgr($conversionmgr); + else + $previewer->setConverters($previewconverters); if($objects) { if($repair) { diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php index 0996df2ce..8811b9320 100644 --- a/views/bootstrap/class.RemoveUserFromProcesses.php +++ b/views/bootstrap/class.RemoveUserFromProcesses.php @@ -52,20 +52,24 @@ $(document).ready( function() { function printList() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; - $settings = $this->params['settings']; - $cachedir = $this->params['cachedir']; - $rootfolder = $this->params['rootfolder']; - $previewwidth = $this->params['previewWidthList']; - $previewconverters = $this->params['previewconverters']; - $timeout = $this->params['timeout']; + $settings = $this->params['settings']; + $cachedir = $this->params['cachedir']; + $rootfolder = $this->params['rootfolder']; + $conversionmgr = $this->params['conversionmgr']; + $previewwidth = $this->params['previewWidthList']; + $previewconverters = $this->params['previewconverters']; + $timeout = $this->params['timeout']; $rmuser = $this->params['rmuser']; $task = $this->params['task']; if(!$task) return; - $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout); - $previewer->setConverters($previewconverters); + $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout); + if($conversionmgr) + $previewer->setConversionMgr($conversionmgr); + else + $previewer->setConverters($previewconverters); $docs = array(); switch($task) {