Browse Source

Merge pull request #541 from AngelFQC/7555

Fix save exercise feedback either advanced editor or textarea - refs #7555
Yannick Warnier 10 years ago
parent
commit
ad257eae10
2 changed files with 4 additions and 4 deletions
  1. 3 3
      main/exercice/exercise_show.php
  2. 1 1
      main/install/configuration.dist.php

+ 3 - 3
main/exercice/exercise_show.php

@@ -66,7 +66,7 @@ if (api_is_course_session_coach(
     }
 }
 
-$maxEditors = isset($_configuration['exercise_max_fckeditors_in_page']) ? $_configuration['exercise_max_fckeditors_in_page'] : 0;
+$maxEditors = isset($_configuration['exercise_max_ckeditors_in_page']) ? $_configuration['exercise_max_ckeditors_in_page'] : 0;
 $is_allowedToEdit = api_is_allowed_to_edit(null, true) || $is_courseTutor || api_is_session_admin() || api_is_drh() || api_is_student_boss();
 
 //Getting results from the exe_id. This variable also contain all the information about the exercise
@@ -127,7 +127,7 @@ if ($origin != 'learnpath') {
 }
 ?>
 <script>
-var maxEditors = '<?php echo intval($maxEditors); ?>';
+var maxEditors = <?php echo intval($maxEditors); ?>;
 
 function showfck(sid,marksid) {
 	document.getElementById(sid).style.display='block';
@@ -154,7 +154,7 @@ function getFCK(vals,marksid) {
 		var oHidden = document.createElement("input");
 		oHidden.type = "hidden";
 		oHidden.name = "comments_"+ids[k];
-        if (maxEditors == 0) {
+        if (CKEDITOR.instances[oHidden.name]) {
             oHidden.value = CKEDITOR.instances[oHidden.name].getData();
         } else {
             oHidden.value = $("textarea[name='" + oHidden.name + "']").val();

+ 1 - 1
main/install/configuration.dist.php

@@ -283,7 +283,7 @@ $_configuration['system_stable']     = NEW_VERSION_STABLE;
 //$_configuration['certificate_filter_by_official_code'] = false;
 // Max quantity of fkceditor allowed in the exercise result page otherwise
 // Textareas are used.
-//$_configuration['exercise_max_fckeditors_in_page'] = 0;
+//$_configuration['exercise_max_ckeditors_in_page'] = 0;
 // Default upload option
 //$_configuration['document_if_file_exists_option'] = 'rename'; // overwrite
 // Which OpenBadges backpack send the badges