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

Fix #397 error while uploading file to an existing directory

Browse source
This commit is contained in:
Kijin Sung 2016-03-21 16:18:31 +09:00
parent 9e6e7efbfd
commit 45b2910cee
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
classes/file/FileHandler.class.php
View file

@ -176,7 +176,8 @@ class FileHandler
{
if (!ini_get('safe_mode'))
{
return Rhymix\Framework\Storage::createDirectory(self::getRealPath($path_string));
$path = self::getRealPath($path_string);
return Rhymix\Framework\Storage::isDirectory($path) || Rhymix\Framework\Storage::createDirectory($path);
}
// if safe_mode is on, use FTP

5
modules/file/file.controller.php
View file

@ -763,7 +763,10 @@ class fileController extends file
}
// Create a directory
if(!FileHandler::makeDir($path)) return new Object(-1,'msg_not_permitted_create');
if(!Rhymix\Framework\Storage::isDirectory($path) && !Rhymix\Framework\Storage::createDirectory($path))
{
return new Object(-1,'msg_not_permitted_create');
}
// Move the file
if($manual_insert)