Authored by 郝肖肖

Merge branch 'release/4.4' of http://git.dev.yoho.cn/web/yohobuy into release/4.4

@@ -475,10 +475,10 @@ class ReturnsModel @@ -475,10 +475,10 @@ class ReturnsModel
475 $result['code'] = 400; 475 $result['code'] = 400;
476 $result['message'] = '文件上传错误'; 476 $result['message'] = '文件上传错误';
477 } else { 477 } else {
478 - $type = array('image/png','image/jpeg','image/bmp','image/gif');  
479 - if (!in_array($_FILES['fileData']['type'],$type)) {  
480 - return array('code'=>'400','message'=>'图片格式错误');  
481 - } 478 +// $type = array('image/png','image/jpeg','image/bmp','image/gif');
  479 +// if (!in_array($_FILES['fileData']['type'],$type)) {
  480 +// return array('code'=>'400','message'=>'图片格式错误');
  481 +// }
482 $result = Images::saveImage($filename); 482 $result = Images::saveImage($filename);
483 } 483 }
484 484