Merge branch 'MDL-24064-master' of git://github.com/FMCorz/moodle

robjoyce · Jun 13, 2016 · 377b29d · 377b29d
2 parents a0a6367 + 7c9968b
commit 377b29d
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 136 deletions.
diff --git a/admin/user/user_bulk.php b/admin/user/user_bulk.php
@@ -24,7 +24,6 @@
         case 3: redirect($CFG->wwwroot.'/'.$CFG->admin.'/user/user_bulk_delete.php');
         case 4: redirect($CFG->wwwroot.'/'.$CFG->admin.'/user/user_bulk_display.php');
         case 5: redirect($CFG->wwwroot.'/'.$CFG->admin.'/user/user_bulk_download.php');
-        //case 6: redirect($CFG->wwwroot.'/'.$CFG->admin.'/user/user_bulk_enrol.php'); //TODO: MDL-24064
         case 7: redirect($CFG->wwwroot.'/'.$CFG->admin.'/user/user_bulk_forcepasswordchange.php');
         case 8: redirect($CFG->wwwroot.'/'.$CFG->admin.'/user/user_bulk_cohortadd.php');
     }

diff --git a/admin/user/user_bulk_enrol.php b/admin/user/user_bulk_enrol.php
diff --git a/admin/user/user_bulk_forms.php b/admin/user/user_bulk_forms.php
@@ -24,10 +24,6 @@ function definition() {
         if (has_capability('moodle/user:update', $syscontext)) {
             $actions[5] = get_string('download', 'admin');
         }
-        if (has_capability('moodle/role:assign', $syscontext)){
-             //TODO: MDL-24064
-            //$actions[6] = get_string('enrolmultipleusers', 'admin');
-        }
         if (has_capability('moodle/user:update', $syscontext)) {
             $actions[7] = get_string('forcepasswordchange');
         }