Merge branch 'MDL-33593' of git://github.com/danpoltawski/moodle

course/dnduploadlib.php

@@ -39,7 +39,7 @@ require_once($CFG->dirroot.'/course/lib.php');
 function dndupload_add_to_course($course, $modnames) {
     global $CFG, $PAGE;
 
-    $showstatus = optional_param('editingenabled', false, PARAM_BOOL);
+    $showstatus = optional_param('notifyeditingon', false, PARAM_BOOL);
 
     // Get all handlers.
     $handler = new dndupload_handler($course, $modnames);
@@ -671,4 +671,4 @@ class dndupload_ajax_processor {
         echo json_encode($resp);
         die();
     }
-}
+}

course/view.php

@@ -130,7 +130,7 @@
             if ($course->id == SITEID) {
                 redirect($CFG->wwwroot .'/?redirect=0');
             } else {
-                $url = new moodle_url($PAGE->url, array('editingenabled' => 1));
+                $url = new moodle_url($PAGE->url, array('notifyeditingon' => 1));
                 redirect($url);
             }
         } else if (($edit == 0) and confirm_sesskey()) {