Permalink
Browse files

Merge branch 'MDL-29048-m21' of git://github.com/ankitagarwal/moodle …

…into MOODLE_21_STABLE
  • Loading branch information...
2 parents bc89692 + 3e08162 commit 65cb4fe5484258cad15664a7a9b3539228835f0a @stronk7 stronk7 committed Dec 20, 2011
Showing with 5 additions and 0 deletions.
  1. +5 −0 mod/glossary/backup/moodle2/restore_glossary_stepslib.php
@@ -66,6 +66,11 @@ protected function process_glossary($data) {
if (!in_array($data->displayformat, $formats)) {
$data->displayformat = 'dictionary';
}
+ if (!empty($data->mainglossary) and $data->mainglossary == 1 and
+ $DB->record_exists('glossary', array('mainglossary' => 1, 'course' => $this->get_courseid()))) {
+ // Only allow one main glossary in the course
+ $data->mainglossary = 0;
+ }
// insert the glossary record
$newitemid = $DB->insert_record('glossary', $data);

0 comments on commit 65cb4fe

Please sign in to comment.