From: skodak Date: Sat, 28 Jun 2008 11:10:33 +0000 (+0000) Subject: MDL-15455 fixed incomplete dml query conversion X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=f62fdb21d79a79fc146bfcb95726b4ca77e50ad9;p=moodle.git MDL-15455 fixed incomplete dml query conversion --- diff --git a/mod/glossary/filter.php b/mod/glossary/filter.php index d6f1738276..0b6fbbddb7 100644 --- a/mod/glossary/filter.php +++ b/mod/glossary/filter.php @@ -47,11 +47,11 @@ function glossary_filter($courseid, $text) { /// Pull out all the raw data from the database for entries, categories and aliases $entries = $DB->get_records_select('glossary_entries', - 'glossaryid IN ('.$glossarylist.') AND usedynalink != 0 AND approved != 0 ', '', + 'glossaryid IN ('.$glossarylist.') AND usedynalink != 0 AND approved != 0 ', null, '', 'id,glossaryid, concept, casesensitive, 0 AS category, fullmatch'); $categories = $DB->get_records_select('glossary_categories', - 'glossaryid IN ('.$glossarylist.') AND usedynalink != 0', '', + 'glossaryid IN ('.$glossarylist.') AND usedynalink != 0', null, '', 'id,glossaryid,name AS concept, 1 AS casesensitive, 1 AS category, 1 AS fullmatch'); $aliases = $DB->get_records_sql('SELECT ga.id, ge.glossaryid, ga.alias as concept, ge.concept as originalconcept, @@ -61,7 +61,7 @@ function glossary_filter($courseid, $text) { WHERE ga.entryid = ge.id AND ge.glossaryid IN ('.$glossarylist.') AND ge.usedynalink != 0 - AND ge.approved != 0'); + AND ge.approved != 0', null); /// Combine them into one big list