fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-05 09:41:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Do not create thumbnails if thumbnail_type is none

Browse source
This commit is contained in:
Kijin Sung 2016-12-17 17:48:32 +09:00
parent 73a690bfae
commit af7bab4814
2 changed files with 37 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

31
modules/document/document.item.php
View file

@ -879,6 +879,24 @@ class documentItem extends Object
// Return false if the document doesn't exist
if(!$this->document_srl) return;
// Get thumbnai_type information from document module's configuration
if(!in_array($thumbnail_type, array('crop', 'ratio', 'none')))
{
$config = $GLOBALS['__document_config__'];
if(!$config)
{
$oDocumentModel = getModel('document');
$config = $oDocumentModel->getDocumentConfig();
$GLOBALS['__document_config__'] = $config;
}
$thumbnail_type = $config->thumbnail_type ?: 'crop';
}
if ($thumbnail_type === 'none')
{
return;
}
if($this->isSecret() && !$this->isGranted())
{
return;
@ -897,20 +915,9 @@ class documentItem extends Object
$output = executeQuery('document.getDocument', $args);
$content = $output->data->content;
}
// Return false if neither attachement nor image files in the document
if(!$this->get('uploaded_count') && !preg_match("!<img!is", $content)) return;
// Get thumbnai_type information from document module's configuration
if(!in_array($thumbnail_type, array('crop','ratio')))
{
$config = $GLOBALS['__document_config__'];
if(!$config)
{
$oDocumentModel = getModel('document');
$config = $oDocumentModel->getDocumentConfig();
$GLOBALS['__document_config__'] = $config;
}
$thumbnail_type = $config->thumbnail_type ?: 'crop';
}
// Define thumbnail information
$thumbnail_path = sprintf('files/thumbnails/%s',getNumberingPath($this->document_srl, 3));