Skip to content

Commit

Permalink
MDL-35637 group: Fix form submission error that occurs when GD versio…
Browse files Browse the repository at this point in the history
…n is not set.
  • Loading branch information
mdjnelson committed Sep 27, 2012
1 parent a3ab18c commit 5a45b93
Showing 1 changed file with 11 additions and 10 deletions.
21 changes: 11 additions & 10 deletions group/lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -311,17 +311,18 @@ function groups_update_group_icon($group, $data, $editform) {
$context = context_course::instance($group->courseid, MUST_EXIST);

//TODO: it would make sense to allow picture deleting too (skodak)

if ($iconfile = $editform->save_temp_file('imagefile')) {
if (process_new_icon($context, 'group', 'icon', $group->id, $iconfile)) {
$DB->set_field('groups', 'picture', 1, array('id'=>$group->id));
$group->picture = 1;
} else {
$fs->delete_area_files($context->id, 'group', 'icon', $group->id);
$DB->set_field('groups', 'picture', 0, array('id'=>$group->id));
$group->picture = 0;
if (!empty($CFG->gdversion)) {
if ($iconfile = $editform->save_temp_file('imagefile')) {
if (process_new_icon($context, 'group', 'icon', $group->id, $iconfile)) {
$DB->set_field('groups', 'picture', 1, array('id'=>$group->id));
$group->picture = 1;
} else {
$fs->delete_area_files($context->id, 'group', 'icon', $group->id);
$DB->set_field('groups', 'picture', 0, array('id'=>$group->id));
$group->picture = 0;
}
@unlink($iconfile);
}
@unlink($iconfile);
}
}

Expand Down

0 comments on commit 5a45b93

Please sign in to comment.