firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'g5'

Browse Source
This commit is contained in:
chicpro
2014-07-22 09:03:55 +09:00
parent c9943c9cb0 6a939480c9
commit 0c1e38ddc8
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/editor/smarteditor2/photo_uploader/popup/js/basic.js
View File

@ -152,7 +152,7 @@ jQuery(function ($) {
_done : function(e, data){
var othis = this;
$.each(data.result.files, function (index, file) {
if (file.url) {
if (file.url && !file.error) {
var ret = othis.get_ratio( file.width, file.height ),
node = $(data.context.children()[index]),
size_text = file.width+" x "+file.height,

3
plugin/editor/smarteditor2/photo_uploader/popup/php/UploadHandler.php
View File

@ -1086,6 +1086,9 @@ class UploadHandler
$image_width_height = $this->get_image_size($file_path);
$file->width = $image_width_height[0];
$file->height = $image_width_height[1];
} else { //로빈아빠님이 알려주심, 이미지 업로드 체크
unlink($file_path);
$file->error = $this->get_error_message('accept_file_types');
}
} else {
$file->size = $file_size;