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

Merge branch 'MDL-60669-master' of git://github.com/tobiasreischmann/moodle

Browse source
This commit is contained in:
Damyon Wiese 2017-11-28 12:05:21 +08:00
commit 2c3d8a06c8
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mod/forum/backup/moodle2/restore_forum_stepslib.php
View file

@ -168,8 +168,14 @@ class restore_forum_activity_structure_step extends restore_activity_structure_s
$data->forum = $this->get_new_parentid('forum');
$data->userid = $this->get_mappingid('user', $data->userid);
// Create only a new subscription if it does not already exist (see MDL-59854).
if ($subscription = $DB->get_record('forum_subscriptions',
array('forum' => $data->forum, 'userid' => $data->userid))) {
$this->set_mapping('forum_subscription', $oldid, $subscription->id, true);
} else {
$newitemid = $DB->insert_record('forum_subscriptions', $data);
$this->set_mapping('forum_subscription', $oldid, $newitemid, true);
}
}