MDL-47494 ddwtos: Merge branch 'wip_lib_php_fixes_2_1' into wip_lib_f…

…ixes

Conflicts:
	lib.php
Merge branch 'wip_lib_php_fixes_2_1' into wip_lib_fixes

Conflicts:
	lib.php

question/type/ddwtos/lib.php

@@ -33,6 +33,6 @@
 function qtype_ddwtos_pluginfile($course, $cm, $context, $filearea, $args, $forcedownload, array $options=array()) {
     global $CFG;
     require_once($CFG->libdir . '/questionlib.php');
-    question_pluginfile($course, $context, 'qtype_ddmarker', $filearea, $args, $forcedownload, $options);
+    question_pluginfile($course, $context, 'qtype_ddwtos', $filearea, $args, $forcedownload, $options);
 }