From 34e24cd360cbdb97a6d99a57f679be210561e97f Mon Sep 17 00:00:00 2001
From: Pierre Pichet <pichet.pierre@uqam.ca>
Date: Fri, 23 Apr 2010 23:07:52 +0000
Subject: [PATCH] MDL-10110 correcting answers display and defining
 CALCULATEDMULTI for format

---
 question/type/calculatedmulti/questiontype.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/question/type/calculatedmulti/questiontype.php b/question/type/calculatedmulti/questiontype.php
index f3dc21c7514..74fac7f066a 100644
--- a/question/type/calculatedmulti/questiontype.php
+++ b/question/type/calculatedmulti/questiontype.php
@@ -260,7 +260,7 @@ class question_calculatedmulti_qtype extends question_calculated_qtype {
                         $str = $texteval->answer;
                             }
                         }
-                        $qtext = $qtext.$regs1[0].$str ;
+                        $qtext = $qtext.$str ;
                 }
                 $answer->answer = $qtext.$qtextremaining ; ;
             }
@@ -514,3 +514,7 @@ class question_calculatedmulti_qtype extends question_calculated_qtype {
 //// INITIATION - Without this line the question type is not in use... ///
 //////////////////////////////////////////////////////////////////////////
 question_register_questiontype(new question_calculatedmulti_qtype());
+
+if ( ! defined ("CALCULATEDMULTI")) {
+    define("CALCULATEDMULTI",    "calculatedmulti");
+}