Merge remote-tracking branch 'origin/1.11.x' into 1.11.x

pull/2990/head
Yannick Warnier 6 years ago
commit b07dcef6c0
  1. 2
      main/exercise/exercise.class.php
  2. 1
      main/mySpace/access_details_session.php

@ -7939,6 +7939,7 @@ class Exercise
if (empty($this->exerciseCategoryId)) { if (empty($this->exerciseCategoryId)) {
return null; return null;
} }
return (int) $this->exerciseCategoryId; return (int) $this->exerciseCategoryId;
} }
@ -8372,6 +8373,7 @@ class Exercise
* Return an HTML table of exercises for on-screen printing, including * Return an HTML table of exercises for on-screen printing, including
* action icons. If no exercise is present and the user can edit the * action icons. If no exercise is present and the user can edit the
* course, show a "create test" button. * course, show a "create test" button.
*
* @param int $categoryId * @param int $categoryId
* @param string $keyword * @param string $keyword
* *

@ -249,7 +249,6 @@ if ($form->validate()) {
api_format_time($partialDuration, 'js'), api_format_time($partialDuration, 'js'),
]; ];
$report[0]['courses'][$course['course_id']][] = $record; $report[0]['courses'][$course['course_id']][] = $record;
$report[0]['name'][$course['course_id']] = $course['title']; $report[0]['name'][$course['course_id']] = $course['title'];
} }

Loading…
Cancel
Save