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

Fix incorrect reporting of maximum allowed filesize

Browse source
This commit is contained in:
Kijin Sung 2017-06-29 19:51:00 +09:00
parent 61930d5129
commit b8cd244836
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/editor/editor.model.php
View file

@ -300,14 +300,14 @@ class editorModel extends editor
$browser = Rhymix\Framework\UA::getBrowserInfo(); $browser = Rhymix\Framework\UA::getBrowserInfo();
if (($browser->browser === 'IE' && version_compare($browser->version, '10', '<')) || $browser->browser === 'Android' || $browser->browser === 'Opera') if (($browser->browser === 'IE' && version_compare($browser->version, '10', '<')) || $browser->browser === 'Android' || $browser->browser === 'Opera')
{ {
$file_config->allowed_filesize = min(FileHandler::returnBytes(ini_get('upload_max_filesize')), FileHandler::returnBytes(ini_get('post_max_size'))); $file_config->allowed_filesize = min($file_config->allowed_filesize, FileHandler::returnBytes(ini_get('upload_max_filesize')), FileHandler::returnBytes(ini_get('post_max_size')));
$file_config->allowed_chunk_size = 0; $file_config->allowed_chunk_size = 0;
} }
// Do not allow chunked uploads in XpressEditor. // Do not allow chunked uploads in XpressEditor.
if (starts_with($option->editor_skin, 'xpresseditor')) if (starts_with($option->editor_skin, 'xpresseditor'))
{ {
$file_config->allowed_filesize = min(FileHandler::returnBytes(ini_get('upload_max_filesize')), FileHandler::returnBytes(ini_get('post_max_size'))); $file_config->allowed_filesize = min($file_config->allowed_filesize, FileHandler::returnBytes(ini_get('upload_max_filesize')), FileHandler::returnBytes(ini_get('post_max_size')));
$file_config->allowed_chunk_size = 0; $file_config->allowed_chunk_size = 0;
} }

2
modules/file/file.model.php
View file

@ -344,7 +344,7 @@ class fileModel extends file
} }
else else
{ {
$allowed_filesize = min(FileHandler::returnBytes(ini_get('upload_max_filesize')), FileHandler::returnBytes(ini_get('post_max_size'))); $allowed_filesize = min($file_config->allowed_filesize * 1024 * 1024, FileHandler::returnBytes(ini_get('upload_max_filesize')), FileHandler::returnBytes(ini_get('post_max_size')));
} }
// Display upload status // Display upload status