merge from 1.5.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions

View file

@ -6,7 +6,7 @@
**/
@set_time_limit(0);
@require_once('./modules/importer/extract.class.php');
require_once('./modules/importer/extract.class.php');
class importerAdminController extends importer {
@ -925,7 +925,7 @@
$path = sprintf("./files/attach/images/%s/%s", $module_srl, getNumberingPath($upload_target_srl, 3));
$ext = substr(strrchr($file_info['name'],'.'),1);
$ext = substr(strrchr($file_obj->source_filename,'.'),1);
$_filename = md5(crypt(rand(1000000, 900000), rand(0, 100))).'.'.$ext;
$filename = $path.$_filename;