Merge pull request #300 from uppa/uppa.7155

ywarnier · ywarnier · commit 0bd99fe9231f · 2014-05-15T08:12:59.000-05:00
Fixes #7155 : Exercice description bug
diff --git a/main/exercice/exercise_submit.php b/main/exercice/exercise_submit.php
@@ -684,7 +684,7 @@
                 changestart: function(event, ui) {
                     //var clicked = $(this).find('.ui-state-active').attr('id');
                     //$('#'+clicked).load('/widgets/'+clicked);
-                    $('#collapse1').html('".addslashes($objExercise->description)."');
+                    $('#collapse1').html(".json_encode($objExercise->description).");
                 }
             });
          });

Original file line number	Diff line number	Diff line change
`@@ -684,7 +684,7 @@`
`684`	`684`	`changestart: function(event, ui) {`
`685`	`685`	`//var clicked = $(this).find('.ui-state-active').attr('id');`
`686`	`686`	`//$('#'+clicked).load('/widgets/'+clicked);`
`687`		`- $('#collapse1').html('".addslashes($objExercise->description)."');`
	`687`	`+ $('#collapse1').html(".json_encode($objExercise->description).");`
`688`	`688`	`}`
`689`	`689`	`});`
`690`	`690`	`});`