From e7ef42f531827f56ef7a84f6198f99d892c4a9b6 Mon Sep 17 00:00:00 2001 From: thepurpleblob Date: Mon, 7 Jul 2008 11:54:39 +0000 Subject: [PATCH] MDL-15473 Fixed typo causing the image location to be ignored if the base_64 image is not included. Mereged from STABLE_19 --- question/format/xml/format.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/question/format/xml/format.php b/question/format/xml/format.php index dd84da0dc8..dc008f1188 100755 --- a/question/format/xml/format.php +++ b/question/format/xml/format.php @@ -117,7 +117,7 @@ class qformat_xml extends qformat_default { /** * import parts of question common to all types - * @param array question question array from xml tree + * @param $question array question question array from xml tree * @return object question object */ function import_headers( $question ) { @@ -132,10 +132,10 @@ class qformat_xml extends qformat_default { $qo->name = $this->getpath( $question, array('#','name',0,'#','text',0,'#'), '', true, $error_noname ); $qo->questiontext = $this->getpath( $question, array('#','questiontext',0,'#','text',0,'#'), '', true ); $qo->questiontextformat = $this->getpath( $question, array('#','questiontext',0,'@','format'), '' ); - $image = $this->getpath( $question, array('#','image',0,'#'), $qo->image ); + $qo->image = $this->getpath( $question, array('#','image',0,'#'), $qo->image ); $image_base64 = $this->getpath( $question, array('#','image_base64','0','#'),'' ); if (!empty($image_base64)) { - $qo->image = $this->importimagefile( $image, $image_base64); + $qo->image = $this->importimagefile( $qo->image, stripslashes($image_base64) ); } $qo->generalfeedback = $this->getpath( $question, array('#','generalfeedback',0,'#','text',0,'#'), $qo->generalfeedback, true ); $qo->defaultgrade = $this->getpath( $question, array('#','defaultgrade',0,'#'), $qo->defaultgrade ); -- 2.39.5