Merge branch 'pr/1248' into develop

Conflicts:
	modules/point/point.admin.controller.php
This commit is contained in:
bnu 2015-03-23 20:06:40 +09:00
commit 55f67b00e5

View file

@ -74,20 +74,19 @@ class pointAdminController extends point
$group_srl = $group->group_srl;
//if group level is higher than max level, change to max level
if($args->{'point_group_'.$group_srl} > $args->max_level)
if(isset($args->{'point_group_'.$group_srl}))
{
$args->{'point_group_'.$group_srl} = $args->max_level;
}
//if group level is higher than max level, change to max level
if($args->{'point_group_'.$group_srl} > $args->max_level)
{
$args->{'point_group_'.$group_srl} = $args->max_level;
}
//if group level is lower than 1, change to 1
if($args->{'point_group_'.$group_srl} < 1)
{
$args->{'point_group_'.$group_srl} = 1;
}
if($args->{'point_group_'.$group_srl})
{
//if group level is lower than 1, change to 1
if($args->{'point_group_'.$group_srl} < 1)
{
$args->{'point_group_'.$group_srl} = 1;
}
$config->point_group[$group_srl] = $args->{'point_group_'.$group_srl};
}
else