Merge branch 'MDL-61967-master' of git://github.com/sarjona/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 25 Sep 2018 09:08:53 +0000 (11:08 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 25 Sep 2018 09:08:53 +0000 (11:08 +0200)
1  2 
lib/enrollib.php
lib/tests/accesslib_test.php
lib/upgrade.txt
user/lib.php
user/tests/userlib_test.php

Simple merge
Simple merge
diff --cc lib/upgrade.txt
@@@ -121,11 -121,9 +121,14 @@@ information provided here is intended e
    - phone1
    - phone2
    - address
 +* New function mark_user_dirty() must be called after changing data that gets cached in user sessions. Examples:
 +  - Assigning roles to users.
 +  - Unassigning roles from users.
 +  - Enrolling users into courses.
 +  - Unenrolling users from courses.
+ * New optional parameter $context for the groups_get_members_join() function and ability to filter users that are not members of
+ any group. Besides, groups_get_members_ids_sql, get_enrolled_sql and get_enrolled_users now accepts -1 (USERSWITHOUTGROUP) for
+ the groupid field.
  
  === 3.5 ===
  
diff --cc user/lib.php
Simple merge
Simple merge