Skip to content

Commit

Permalink
Merge branch 'MDL-60058-int-fix-1' of github.com:ryanwyllie/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
Damyon Wiese committed Oct 17, 2017
2 parents 0b53be9 + dbe537f commit b35b588
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions mod/assign/lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -1950,7 +1950,9 @@ function mod_assign_core_calendar_event_action_shows_item_count(calendar_event $
* @param stdClass|null $instance The module instance to get the range from
*/
function mod_assign_core_calendar_get_valid_event_timestart_range(\calendar_event $event, \stdClass $instance = null) {
global $DB;
global $CFG, $DB;

require_once($CFG->dirroot . '/mod/assign/locallib.php');

if (!$instance) {
$instance = $DB->get_record('assign', ['id' => $event->instance]);
Expand Down Expand Up @@ -2016,7 +2018,9 @@ function mod_assign_core_calendar_validate_event_timestart(\calendar_event $even
* @param \calendar_event $event
*/
function mod_assign_core_calendar_event_timestart_updated(\calendar_event $event) {
global $DB;
global $CFG, $DB;

require_once($CFG->dirroot . '/mod/assign/locallib.php');

if (empty($event->instance) || $event->modulename != 'assign') {
return;
Expand Down

0 comments on commit b35b588

Please sign in to comment.