merge to trunk

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13176 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-30 22:58:41 +00:00
parent 2d3f149b5a
commit 3b7548ff52
3 changed files with 4 additions and 4 deletions

View file

@ -314,6 +314,8 @@ class fileController extends file
unset($_SESSION[$session_key][$file_srl]);
Context::close();
$fp = fopen($uploaded_filename, 'rb');
if(!$fp) return $this->stop('msg_file_not_found');
@ -337,8 +339,6 @@ class fileController extends file
fpassthru($fp);
}
Context::close();
exit();
}