mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-14 21:51:32 +00:00
backport some changes from 6.0.x
This commit is contained in:
parent
4c39fb065a
commit
496bc9214d
|
@ -73,6 +73,7 @@ class SeedDMS_Preview_Base {
|
||||||
$this->previewDir = $previewDir;
|
$this->previewDir = $previewDir;
|
||||||
}
|
}
|
||||||
$this->timeout = intval($timeout);
|
$this->timeout = intval($timeout);
|
||||||
|
$this->converters = array();
|
||||||
$this->xsendfile = $xsendfile;
|
$this->xsendfile = $xsendfile;
|
||||||
$this->conversionmgr = null;
|
$this->conversionmgr = null;
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
@ -154,7 +155,10 @@ class SeedDMS_Preview_Base {
|
||||||
* and the value is the command to be called for creating the preview
|
* and the value is the command to be called for creating the preview
|
||||||
*/
|
*/
|
||||||
function setConverters($arr) { /* {{{ */
|
function setConverters($arr) { /* {{{ */
|
||||||
$this->converters = $arr;
|
if(is_array($arr))
|
||||||
|
$this->converters = $arr;
|
||||||
|
else
|
||||||
|
$this->converters = array();
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue
Block a user