From 464ee7577d177faef4662880ff2a07cb94370494 Mon Sep 17 00:00:00 2001 From: Charles Fulton Date: Sat, 26 Nov 2011 09:45:39 -0800 Subject: [PATCH] MDL-29848 glossary: get proper context for comments on exported entry --- mod/glossary/lib.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php index d782547adaf..4a7965bfecf 100644 --- a/mod/glossary/lib.php +++ b/mod/glossary/lib.php @@ -2890,7 +2890,12 @@ function glossary_comment_validate($comment_param) { if (!$record = $DB->get_record('glossary_entries', array('id'=>$comment_param->itemid))) { throw new comment_exception('invalidcommentitemid'); } - if (!$glossary = $DB->get_record('glossary', array('id'=>$record->glossaryid))) { + if ($record->sourceglossaryid && $record->sourceglossaryid == $comment_param->cm->instance) { + $glossary = $DB->get_record('glossary', array('id'=>$record->sourceglossaryid)); + } else { + $glossary = $DB->get_record('glossary', array('id'=>$record->glossaryid)); + } + if (!$glossary) { throw new comment_exception('invalidid', 'data'); } if (!$course = $DB->get_record('course', array('id'=>$glossary->course))) {