Bladeren bron

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

Angel Fernando Quiroz Campos 8 jaren geleden
bovenliggende
commit
3a8cca08d3

+ 2 - 2
main/exercise/question.class.php

@@ -1575,10 +1575,10 @@ abstract class Question
 
             switch ($this->type) {
                 case UNIQUE_ANSWER:
-                    $form->addButton('convertAnswer', get_lang('ConvertToMultipleAnswer'), 'dot-circle-o', 'info');
+                    $form->addButton('convertAnswer', get_lang('ConvertToMultipleAnswer'), 'dot-circle-o', 'default');
                     break;
                 case MULTIPLE_ANSWER:
-                    $form->addButton('convertAnswer', get_lang('ConvertToUniqueAnswer'), 'check-square-o', 'info');
+                    $form->addButton('convertAnswer', get_lang('ConvertToUniqueAnswer'), 'check-square-o', 'default');
                     break;
             }
 

+ 1 - 1
main/inc/lib/javascript/ckeditor/config_js.php

@@ -14,5 +14,5 @@ $template->assign('moreButtonsInMaximizedMode', $moreButtonsInMaximizedMode);
 $template->assign('course_condition', api_get_cidreq());
 
 header('Content-type: application/x-javascript');
-$template->display('default/javascript/editor/ckeditor/config_js.tpl');
+$template->display($template->get_template('javascript/editor/ckeditor/config_js.tpl'));
 

+ 4 - 0
main/inc/lib/pear/HTML/Table/Storage.php

@@ -838,6 +838,10 @@ class HTML_Table_Storage extends HTML_Common
     {
         $colspan = isset($attributes['colspan']) ? $attributes['colspan'] : 1;
         $rowspan = isset($attributes['rowspan']) ? $attributes['rowspan'] : 1;
+        if (!is_numeric($row) or !is_numeric($col)) {
+            //throw new Exception('Row or column index is not numerical');
+            return;
+        }
         if (($row + $rowspan - 1) >= $this->_rows) {
             if ($this->_autoGrow) {
                 $this->_rows = $row + $rowspan;