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

Merge branch 'wip-MDL-37812-master' of git://github.com/marinaglancy/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2014-07-15 12:07:05 +12:00
commit 6a91c41a49
8 changed files with 166 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/testing/generator/data_generator.php
View file

@ -219,7 +219,23 @@ EOD;
}
if (!isset($record['maildisplay'])) {
$record['maildisplay'] = 1;
$record['maildisplay'] = $CFG->defaultpreference_maildisplay;
}
if (!isset($record['mailformat'])) {
$record['mailformat'] = $CFG->defaultpreference_mailformat;
}
if (!isset($record['maildigest'])) {
$record['maildigest'] = $CFG->defaultpreference_maildigest;
}
if (!isset($record['autosubscribe'])) {
$record['autosubscribe'] = $CFG->defaultpreference_autosubscribe;
}
if (!isset($record['trackforums'])) {
$record['trackforums'] = $CFG->defaultpreference_trackforums;
}
if (!isset($record['deleted'])) {