Browse Source

Merge branch '1.9.x' of github.com:chamilo/chamilo-lms into 1.9.x

Yannick Warnier 10 years ago
parent
commit
f7e674fc75
2 changed files with 2 additions and 2 deletions
  1. 1 1
      main/exercice/exercise_submit.php
  2. 1 1
      main/inc/lib/main_api.lib.php

+ 1 - 1
main/exercice/exercise_submit.php

@@ -684,7 +684,7 @@ if (!empty($objExercise->description)) {
                 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).");
                 }
             });
          });

+ 1 - 1
main/inc/lib/main_api.lib.php

@@ -15,7 +15,7 @@
 // PHP version requirement.
 define('REQUIRED_PHP_VERSION', '5.3');
 
-define('REQUIRED_MIN_MEMORY_LIMIT',         '32');
+define('REQUIRED_MIN_MEMORY_LIMIT',         '128');
 define('REQUIRED_MIN_UPLOAD_MAX_FILESIZE',  '10');
 define('REQUIRED_MIN_POST_MAX_SIZE',        '10');