Merge branch 'MDL-36051_24' of git://github.com/rlorenzo/moodle

This commit is contained in:
Dan Poltawski 2012-11-08 15:09:59 +08:00
commit aa289da834
2 changed files with 9 additions and 5 deletions

View file

@ -3635,7 +3635,9 @@ class assign {
'showquickgrading'=>false));
if ($formdata = $mform->get_data()) {
set_user_preference('assign_perpage', $formdata->perpage);
set_user_preference('assign_filter', $formdata->filter);
if (isset($formdata->filter)) {
set_user_preference('assign_filter', $formdata->filter);
}
}
}
@ -4794,4 +4796,4 @@ class assign_portfolio_caller extends portfolio_module_caller_base {
return array(PORTFOLIO_FORMAT_FILE, PORTFOLIO_FORMAT_LEAP2A);
}
}
}