From 6c884b58c933bffc67240429d6e1867fca81fcda Mon Sep 17 00:00:00 2001
From: willcast <willcast>
Date: Sat, 21 Feb 2004 02:48:53 +0000
Subject: [PATCH] - Linking global categories from within courses now works.
---
mod/glossary/dynalink.php | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/mod/glossary/dynalink.php b/mod/glossary/dynalink.php
index b5e58d97c9..b337e4c130 100644
--- a/mod/glossary/dynalink.php
+++ b/mod/glossary/dynalink.php
@@ -33,8 +33,8 @@
break;
}
- $entries = get_records_select("glossary_entries", "glossaryid IN ($glossaries) AND usedynalink != 0 and approved != 0 and concept != ''","$ebylenght glossaryid","id,glossaryid,concept,casesensitive,$GLOSSARY_CONCEPT_IS_ENTRY category,fullmatch");
- $categories = get_records_select("glossary_categories", "glossaryid IN ($glossaries) AND usedynalink != 0", "$cbylenght glossaryid","id,glossaryid,name concept, 1 casesensitive,$GLOSSARY_CONCEPT_IS_CATEGORY category, 1 fullmatch");
+ $entries = get_records_select("glossary_entries", "glossaryid IN ($glossaries) AND usedynalink != 0 and approved != 0 and concept != ''","$ebylenght glossaryid","id,glossaryid, concept,casesensitive,$GLOSSARY_CONCEPT_IS_ENTRY category,fullmatch");
+ $categories = get_records_select("glossary_categories", "glossaryid IN ($glossaries) AND usedynalink != 0", "$cbylenght glossaryid","id,glossaryid, name concept, 1 casesensitive,$GLOSSARY_CONCEPT_IS_CATEGORY category, 1 fullmatch");
if ( $entries and $categories ) {
$concepts = array_merge($entries, $categories);
usort($concepts,'glossary_sort_entries_by_lenght');
@@ -54,7 +54,8 @@
$category = get_record("glossary_categories","id",$concept->id);
$lastcategory = $concept->id;
if ( $cm->instance != $category->glossaryid ) {
- if ( !$cm = get_coursemodule_from_instance("glossary", $category->glossaryid, $courseid) ) {
+ $gcat = get_record("glossary","id",$category->glossaryid);
+ if ( !$cm = get_coursemodule_from_instance("glossary", $category->glossaryid, $gcat->course) ) {
$cm->id = 1;
}
}
--
2.39.5