Added check for <text> fields that contain markup (an error!)

Merged from STABLE_19

diff --git a/question/format/xml/format.php b/question/format/xml/format.php
index e8e4edbe8cf825f39a978cdc99f7130e32d9134c..36d70334cedd2df7037ee3a10b235c06f3e34e9f 100755 (executable)
--- a/question/format/xml/format.php
+++ b/question/format/xml/format.php
@@ -105,6 +105,9 @@ class qformat_xml extends qformat_default {
             else $xml = $xml[$index];
         }
         if ($istext) {
+            if (!is_string($xml)) {
+                $this->error( 'Invalid xml file - string expected (use CDATA?)' );
+            }
             $xml = addslashes( trim( $xml ) );
         }