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

Merge branch 'release/1.7.8' into develop

Browse source
This commit is contained in:
bnu 2014-11-24 16:30:02 +09:00
commit d4e10dd338
16 changed files with 75 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/member/member.admin.controller.php
View file

@ -1115,6 +1115,7 @@ class memberAdminController extends member
}
if(!$args->group_srl) $args->group_srl = getNextSequence();
$args->list_order = $args->group_srl;
$output = executeQuery('member.insertGroup', $args);
$this->_deleteMemberGroupCache($args->site_srl);

2
modules/member/member.controller.php
View file

@ -722,6 +722,8 @@ class memberController extends member
elseif($type == 2) $ext = 'jpg';
else $ext = 'gif';
FileHandler::removeFilesInDir($target_path);
$target_filename = sprintf('%s%d.%s', $target_path, $member_srl, $ext);
// Convert if the image size is larger than a given size or if the format is not a gif
if($width > $max_width || $height > $max_height || $type!=1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, $ext);