Merge branch 'w51_MDL-37303_m25_enrolinstancestatus' of git://github.com/skodak/moodle

This commit is contained in:
Dan Poltawski 2013-01-08 14:22:11 +08:00
commit df0b14c3b5

View File

@ -965,7 +965,7 @@ class course_enrolment_manager {
$details['enrolments'][$ue->id] = array(
'text' => $ue->enrolmentinstancename,
'period' => $period,
'dimmed' => ($periodoutside || $ue->status != ENROL_USER_ACTIVE),
'dimmed' => ($periodoutside or $ue->status != ENROL_USER_ACTIVE or $ue->enrolmentinstance->status != ENROL_INSTANCE_ENABLED),
'actions' => $ue->enrolmentplugin->get_user_enrolment_actions($manager, $ue)
);
}