fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-24 21:03:19 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into next

Browse source
This commit is contained in:
Kijin Sung 2020-09-29 00:23:30 +09:00
commit 177a6c6b7d
42 changed files with 98 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/file/file.controller.php
View file

@ -922,9 +922,9 @@ class fileController extends file
$args->height = $file_info['height'];
$args->duration = $file_info['duration'];
// Set original type if the file is converted
// Set original type
$args->original_type = null;
if($file_info['converted'])
if($file_info['type'] !== $file_info['original_type'])
{
$args->original_type = $file_info['original_type'];
}