Merge branch 'MDL-55225-master' of git://github.com/dpalou/moodle

diff --cc mod/assign/externallib.php
Simple merge

diff --cc mod/assign/tests/externallib_test.php
index d24714a,418ea50..fb87d8d
--- 1/mod/assign/tests/externallib_test.php
--- 2/mod/assign/tests/externallib_test.php
+++ b/mod/assign/tests/externallib_test.php
@@@ -1944,9 -1882,15 +1945,16 @@@ class mod_assign_external_testcase exte
          foreach ($result['lastattempt']['submission']['plugins'] as $plugin) {
              $submissionplugins[$plugin['type']] = $plugin;
          }
-         $this->assertEquals('Submission text', $submissionplugins['onlinetext']['editorfields'][0]['text']);
+ 
+         // Format expected online text.
+         $onlinetext = 'Submission text with a <a href="@@PLUGINFILE@@/intro.txt">link</a>';
+         list($expectedtext, $expectedformat) = external_format_text($onlinetext, FORMAT_HTML, $assign->get_context()->id,
+                 'assignsubmission_onlinetext', ASSIGNSUBMISSION_ONLINETEXT_FILEAREA, $studentsubmission->id);
+ 
+         $this->assertEquals($expectedtext, $submissionplugins['onlinetext']['editorfields'][0]['text']);
+         $this->assertEquals($expectedformat, $submissionplugins['onlinetext']['editorfields'][0]['format']);
 -        $this->assertEquals('/t.txt', $submissionplugins['file']['fileareas'][0]['files'][0]['filepath']);
 +        $this->assertEquals('/', $submissionplugins['file']['fileareas'][0]['files'][0]['filepath']);
 +        $this->assertEquals('t.txt', $submissionplugins['file']['fileareas'][0]['files'][0]['filename']);
      }
  
      /**
@@@ -2087,9 -2032,15 +2096,16 @@@
          foreach ($result['previousattempts'][0]['submission']['plugins'] as $plugin) {
              $submissionplugins[$plugin['type']] = $plugin;
          }
-         $this->assertEquals('Submission text', $submissionplugins['onlinetext']['editorfields'][0]['text']);
 -
+         // Format expected online text.
+         $onlinetext = 'Submission text with a <a href="@@PLUGINFILE@@/intro.txt">link</a>';
+         list($expectedtext, $expectedformat) = external_format_text($onlinetext, FORMAT_HTML, $assign->get_context()->id,
+                 'assignsubmission_onlinetext', ASSIGNSUBMISSION_ONLINETEXT_FILEAREA, $studentsubmission->id);
+ 
+         $this->assertEquals($expectedtext, $submissionplugins['onlinetext']['editorfields'][0]['text']);
+         $this->assertEquals($expectedformat, $submissionplugins['onlinetext']['editorfields'][0]['format']);
 -        $this->assertEquals('/t.txt', $submissionplugins['file']['fileareas'][0]['files'][0]['filepath']);
 +        $this->assertEquals('/', $submissionplugins['file']['fileareas'][0]['files'][0]['filepath']);
 +        $this->assertEquals('t.txt', $submissionplugins['file']['fileareas'][0]['files'][0]['filename']);
++
      }
  
      /**