Browse files

Merging from STABLE

  • Loading branch information...
1 parent 4bd5bb5 commit c0724bdce2cd27d6c7f709244fe29489552b94e0 thepurpleblob committed May 4, 2006
Showing with 7 additions and 1 deletion.
  1. +7 −1 question/format/examview/format.php
View
8 question/format/examview/format.php
@@ -11,6 +11,12 @@
** Support of rejoinders
**
** $Log$
+** Revision 1.3 2006/05/04 11:17:50 thepurpleblob
+** Merging from STABLE
+**
+** Revision 1.2.2.1 2006/05/04 11:15:11 thepurpleblob
+** htmlentities() replaced by s()
+**
** Revision 1.2 2006/03/01 07:36:08 gustav_delius
** Removing some more references to quiz from import/export code
**
@@ -198,7 +204,7 @@ function readquestions($lines)
function htmlPrepare($htmltext)
{
$text = trim($text);
- $text = htmlentities($htmltext, ENT_QUOTES);
+ $text = s($htmltext);
//$htmltext = nl2br($text);
return $text;
}

0 comments on commit c0724bd

Please sign in to comment.