Merge branch 'MDL-60958-int-fix-1' of github.com:ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Feb 2018 05:51:55 +0000 (13:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Feb 2018 05:51:55 +0000 (13:51 +0800)
calendar/tests/helpers.php

index 014ae60..aa53fd4 100644 (file)
@@ -126,7 +126,7 @@ class action_event_test_factory implements event_factory_interface {
                 $user->id = $id;
                 return $user;
             }),
-            new repeat_event_collection($record->id, null, $this),
+            !empty($record->repeatid) ? new repeat_event_collection($record, $this) : null,
             $module,
             $record->eventtype,
             new event_times(