moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-71964-master' of git://github.com/junpataleta/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2021-09-23 10:38:58 +02:00
commit 6943cb85db
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
my/tests/behat/welcome.feature
View file

@ -7,7 +7,7 @@ Feature: Welcome message
Scenario: Log in and being redirected to course page Scenario: Log in and being redirected to course page
Given the following "users" exist: Given the following "users" exist:
| username | password | firstname | lastname | email | | username | password | firstname | lastname | email |
| wf | test | Fei | Wang | wf@z.com | | wf | test | Fei | Wang | fei@example.com |
And the following "courses" exist: And the following "courses" exist:
| fullname | shortname | | fullname | shortname |
| Math 101 | M1O1 | | Math 101 | M1O1 |

2
user/classes/privacy/provider.php
View file

@ -180,7 +180,7 @@ class provider implements
$collection->add_user_preference( $collection->add_user_preference(
'core_user_welcome', 'core_user_welcome',
'privacy:metadata:core_user:preference:core_user_welcome' 'privacy:metadata:user_preference:core_user_welcome'
); );
return $collection; return $collection;