Merge branch 'w33_MDL-29011_m21_nomanualenrol' of git://github.com/skodak/moodle into MOODLE_21_STABLE

2011-08-23 23:13:28 +02:00
parent 80fc30b7bd 5eb8c77850
commit fd7bdf278c
1 changed files with 5 additions and 1 deletions
@@ -198,7 +198,11 @@ class enrol_manual_plugin extends enrol_plugin {
            return false;
        }

-        $button = new enrol_user_button($this->get_manual_enrol_link($instance), get_string('enrolusers', 'enrol_manual'), 'get');
+        if (!$manuallink = $this->get_manual_enrol_link($instance)) {
+            return false;
+        }
+
+        $button = new enrol_user_button($manuallink, get_string('enrolusers', 'enrol_manual'), 'get');
        $button->class .= ' enrol_manual_plugin';

        $startdate = $manager->get_course()->startdate;