MDL-15473

Fixed typo causing the image location to be ignored if the base_64 image is not included.

Mereged from STABLE_19
This commit is contained in:
thepurpleblob
2008-07-07 11:54:39 +00:00
parent eaba88e917
commit e7ef42f531
+3 -3
View File
@@ -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 );