Merge branch 'MDL-60352-master' of git://github.com/andrewnicols/moodle

2017-10-05 16:16:34 +08:00
parent 1afd3c72aa 1df40a2dce
commit 736b368920
1 changed files with 8 additions and 4 deletions
@@ -122,12 +122,16 @@ class repeat_event_collection implements event_collection_interface {
     * @param int $start Start offset.
     * @return \stdClass[]
     */
-    protected function load_event_records($start = 1) {
+    protected function load_event_records($start = 0) {
        global $DB;
-        while ($records = $DB->get_records(
+        while ($records = $DB->get_records_select(
            'event',
-            ['repeatid' => $this->parentid],
-            '',
+            'id <> :parentid AND repeatid = :repeatid',
+            [
+                'parentid' => $this->parentid,
+                'repeatid' => $this->parentid,
+            ],
+            'id ASC',
            '*',
            $start,
            self::DB_QUERY_LIMIT