Revert "MDL-xxxx show appropriate instance status on user enrolments page"
authorDan Poltawski <dan@moodle.com>
Thu, 10 Jan 2013 01:40:19 +0000 (09:40 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 10 Jan 2013 01:40:19 +0000 (09:40 +0800)
This was incorrectly integrated

This reverts commit 0431cc0e16d9855b0adcc7b4612838f6407f462f.

enrol/locallib.php

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