MDL-14679 fixed some more addslashes()

diff --git a/mod/choice/lib.php b/mod/choice/lib.php
index bafb5ef8483c665736829db0863cb81c31d1797d..3e6f36df2be38f23400d56d474137d19c2a9552c 100644 (file)
--- a/mod/choice/lib.php
+++ b/mod/choice/lib.php
@@ -352,7 +352,7 @@ function choice_show_results($choice, $course, $cm, $allresponses, $forcepublish
         case CHOICE_PUBLISH_NAMES:
             echo '<div id="tablecontainer">';
             if ($viewresponses) {
-                echo '<form id="attemptsform" method="post" action="'.$_SERVER['PHP_SELF'].'" onsubmit="var menu = document.getElementById(\'menuaction\'); return (menu.options[menu.selectedIndex].value == \'delete\' ? \''.addslashes(get_string('deleteattemptcheck','quiz')).'\' : true);">';
+                echo '<form id="attemptsform" method="post" action="'.$_SERVER['PHP_SELF'].'" onsubmit="var menu = document.getElementById(\'menuaction\'); return (menu.options[menu.selectedIndex].value == \'delete\' ? \''.addslashes_js(get_string('deleteattemptcheck','quiz')).'\' : true);">';
                 echo '<div>';
                 echo '<input type="hidden" name="id" value="'.$cm->id.'" />';
                 echo '<input type="hidden" name="mode" value="overview" />';

diff --git a/question/format/blackboard/format.php b/question/format/blackboard/format.php
index 460d430ee42d941a3d5d1fecbe76e7fc673b8328..45bcad842624071cb5e94b6fd764d88922009e36 100644 (file)
--- a/question/format/blackboard/format.php
+++ b/question/format/blackboard/format.php
@@ -68,7 +68,6 @@ function process_essay($xml, &$questions ) {
         if ($ishtml) {
             $question->questiontext = html_entity_decode_php4(trim($essayquestion["#"]["BODY"][0]["#"]["TEXT"][0]["#"]));
         }
-        $question->questiontext = addslashes($question->questiontext);
         
         // put name in question object
         $question->name = substr($question->questiontext, 0, 254);