Merge pull request #92 from wiris/v4.12.1

V4.12.1

Author: ptorrent-at-wiris

quizzes/lib/com/wiris/quizzes/impl/QuizzesImpl.class.php

@@ -1059,7 +1059,7 @@ public function newFeedbackRequest($html, $instance) {
 		$r = $this->newGradeRequest($instance);
 		$qr = $r;
 		$qi = $instance;
-		$qr->question = $this->cloneQuestion($qr->question);
+		$qr->question = $this->shallowCopyQuestion($qr->question);
 		com_wiris_quizzes_impl_QuizzesImpl::setVariables($html, $qr->question, $qi, $qr);
 		return $r;
 	}
@@ -1114,21 +1114,12 @@ public function newVariablesRequestWithQuestionData($html, $instance) {
 		}
 		return $this->newVariablesRequest($sb->b, $instance);
 	}
-	public function sanitizeForQuizzesService($question) {
-		$slots = $question->getSlots();
-		{
-			$_g = 0;
-			while($_g < $slots->length) {
-				$slot = $slots[$_g];
-				++$_g;
-				if($slot->getSyntax()->getName() == com_wiris_quizzes_api_assertion_SyntaxName::$MATH_MULTISTEP) {
-					$slot->setSyntax(com_wiris_quizzes_api_assertion_SyntaxName::$MATH);
-				}
-				unset($slot);
-			}
-		}
+	public function shallowCopyQuestion($question) {
+		$copy = new com_wiris_quizzes_impl_QuestionImpl();
+		$copy->importQuestion($question->getImpl());
+		return $copy;
 	}
-	public function cloneQuestion($question) {
+	public function deepCopyQuestion($question) {
 		$serialized = $question->serialize();
 		return $this->readQuestion($serialized);
 	}
@@ -1141,12 +1132,11 @@ public function newVariablesRequest($html, $instance) {
 		if($question === null) {
 			throw new HException("The question must be specified, either as a parameter" . " of this function or as a field of the question instance");
 		}
-		$question = $this->cloneQuestion($question);
+		$question = $this->shallowCopyQuestion($question);
 		$qr = new com_wiris_quizzes_impl_QuestionRequestImpl();
 		$qr->question = $question;
 		$qr->userData = $qi->userData;
 		com_wiris_quizzes_impl_QuizzesImpl::setVariables($html, $question, $qi, $qr);
-		$this->sanitizeForQuizzesService($question);
 		return $qr;
 	}
 	public function readQuestionInstance($xml, $q) {

quizzes/lib/quizzes.js

@@ -2831,7 +2831,7 @@ com.wiris.quizzes.impl.QuizzesImpl.prototype = $extend(com.wiris.quizzes.api.Qui
 		var r = this.newGradeRequest(instance);
 		var qr = r;
 		var qi = instance;
-		qr.question = this.cloneQuestion(qr.question);
+		qr.question = this.shallowCopyQuestion(qr.question);
 		com.wiris.quizzes.impl.QuizzesImpl.setVariables(html,qr.question,qi,qr);
 		return r;
 	}
@@ -2865,16 +2865,12 @@ com.wiris.quizzes.impl.QuizzesImpl.prototype = $extend(com.wiris.quizzes.api.Qui
 		if(html != null) sb.b += Std.string(html);
 		return this.newVariablesRequest(sb.b,instance);
 	}
-	,sanitizeForQuizzesService: function(question) {
-		var slots = question.getSlots();
-		var _g = 0;
-		while(_g < slots.length) {
-			var slot = slots[_g];
-			++_g;
-			if(slot.getSyntax().getName() == com.wiris.quizzes.api.assertion.SyntaxName.MATH_MULTISTEP) slot.setSyntax(com.wiris.quizzes.api.assertion.SyntaxName.MATH);
-		}
+	,shallowCopyQuestion: function(question) {
+		var copy = new com.wiris.quizzes.impl.QuestionImpl();
+		copy.importQuestion(question.getImpl());
+		return copy;
 	}
-	,cloneQuestion: function(question) {
+	,deepCopyQuestion: function(question) {
 		var serialized = question.serialize();
 		return this.readQuestion(serialized);
 	}
@@ -2883,12 +2879,11 @@ com.wiris.quizzes.impl.QuizzesImpl.prototype = $extend(com.wiris.quizzes.api.Qui
 		var qi = instance;
 		var question = qi.question;
 		if(question == null) throw "The question must be specified, either as a parameter" + " of this function or as a field of the question instance";
-		question = this.cloneQuestion(question);
+		question = this.shallowCopyQuestion(question);
 		var qr = new com.wiris.quizzes.impl.QuestionRequestImpl();
 		qr.question = question;
 		qr.userData = qi.userData;
 		com.wiris.quizzes.impl.QuizzesImpl.setVariables(html,question,qi,qr);
-		this.sanitizeForQuizzesService(question);
 		return qr;
 	}
 	,readQuestionInstance: function(xml,q) {

quizzes/lib/util.css

@@ -1 +1 @@
-4.12.0.e19fce
+4.12.1.c0cc90

quizzes/lib/version.txt

@@ -16,9 +16,9 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2024121900;
+$plugin->version = 2024121901;
 $plugin->requires = 2015111600; // Moodle 3.0.
-$plugin->release = '4.12.0';
+$plugin->release = '4.12.1';
 $plugin->maturity = MATURITY_STABLE;
 $plugin->component = 'qtype_wq';
 $plugin->dependencies = array(