Merge branch 'MDL-61407-34-fix' of git://github.com/junpataleta/moodle into MOODLE_34_STABLE

2018-05-07 13:51:37 +08:00
parent 6294e3b9ec f304a59b8a
commit 269327c0fb
1 changed files with 7 additions and 1 deletions
@@ -192,7 +192,13 @@ class provider implements
                    if ($qa->has_manual_comment()) {
                        // Note - the export of the step data will ensure that the files are exported.
                        // No need to do it again here.
-                        list($comment, $commentformat, $step) = $qa->get_manual_comment();
+                        list($comment, $commentformat) = $qa->get_manual_comment();
+                        // Get the step data.
+                        foreach ($qa->get_reverse_step_iterator() as $step) {
+                            if ($step->has_behaviour_var('comment')) {
+                                break;
+                            }
+                        }

                        $comment = writer::with_context($context)
                            ->rewrite_pluginfile_urls(