Index: mod/questionnaire/locallib.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/mod/questionnaire/locallib.php,v
retrieving revision 1.49.2.51
diff -u -r1.49.2.51 locallib.php
--- mod/questionnaire/locallib.php	24 Mar 2009 14:03:00 -0000	1.49.2.51
+++ mod/questionnaire/locallib.php	26 Mar 2009 18:26:53 -0000
@@ -2981,7 +2981,6 @@
     function choice_values($content) {
 
     /// If we run the content through format_text first, any filters we want to use (e.g. multilanguage) should work.
-        $content = format_text($content, FORMAT_HTML);
 
         // examines the content of a possible answer from radio button, check boxes or rate question
         // returns ->text to be displayed, ->image if present, ->modname name of modality, image ->title
@@ -3012,11 +3011,14 @@
             }
         }
         // look for named modalities
+        $contents->text = $content;
         if ($pos = strpos($content, '=')) {
-            $contents->text = substr($content, $pos + 1);
-            $contents->modname =substr($content, 0, $pos);
-        } else {
-            $contents->text = $content;
+            // the equal sign used for named modalities must NOT be followed by a double quote
+            // because an equal sign followed by double quote might introduce e.g. a lang tag
+            if (substr($content, $pos + 1, 1) != '"') {
+                $contents->text = substr($content, $pos + 1);
+                $contents->modname =substr($content, 0, $pos);
+            }
         }
         return $contents;
     }