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

merge with 1.4.5 branch(1.4.5.10)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@9269 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-09-22 05:29:04 +00:00
parent 92332c8ebb
commit a0d57a320f
98 changed files with 970 additions and 432 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -365,6 +365,7 @@
if(!$output->toBool()) return $output;
}
if (!$args->group_srl) $args->group_srl = getNextSequence();
return executeQuery('member.insertGroup', $args);
}
@ -407,14 +408,16 @@
}
function procMemberAdminGroupImageMarkUpdateOrder() {
$oModuleModel = &getModel('module');
$oModuleControll = getController('module');
function procMemberAdminUpdateGroupOrder() {
$vars = Context::getRequestVars();
foreach($vars->group_srls as $key => $val){
$args->group_srl = $val;
$args->list_order = $key + 1;
executeQuery('member.updateMemberGroupListOrder', $args);
}
$config = $oModuleModel->getModuleConfig('member');
// $config->group_image_mark_order = Context::get('group_image_mark_order');
$oModuleControll->insertModuleConfig('member', $config);
header(sprintf('Location:%s', getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList')));
}
/**