From: stronk7 <stronk7>
Date: Mon, 12 Jul 2004 16:35:50 +0000 (+0000)
Subject: In 'categories view' (all and only one), now attachements, edit, comment
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=6e66130338c84c6a4292ce2f3f4e3a0528fc5ce1;p=moodle.git

In 'categories view' (all and only one), now attachements, edit, comment
and delete are working properly. Thanks to frank@nomios.de!!
See bug 1632
(http://moodle.org/bugs/bug.php?op=show&bugid=1632)

Merged from MOODLE_13_STABLE
---

diff --git a/mod/glossary/sql.php b/mod/glossary/sql.php
index 53eb4e9310..a7073d53a8 100644
--- a/mod/glossary/sql.php
+++ b/mod/glossary/sql.php
@@ -43,7 +43,7 @@
     case GLOSSARY_CATEGORY_VIEW:
         if ($hook == GLOSSARY_SHOW_ALL_CATEGORIES  ) { 
 
-            $sqlselect = "SELECT ge.*, gec.id, gc.name $as pivot";
+            $sqlselect = "SELECT ge.*, gec.entryid, gc.name $as pivot";
             $sqlfrom   = "FROM {$CFG->prefix}glossary_entries ge,
                          {$CFG->prefix}glossary_entries_categories gec,
                          {$CFG->prefix}glossary_categories gc";
@@ -71,7 +71,7 @@
         } else {
 
             $printpivot = 0;
-            $sqlselect  = "SELECT ge.*, ce.id, c.name $as pivot";
+            $sqlselect  = "SELECT ge.*, ce.entryid, c.name $as pivot";
             $sqlfrom    = "FROM {$CFG->prefix}glossary_entries ge, {$CFG->prefix}glossary_entries_categories ce, {$CFG->prefix}glossary_categories c";
             $sqlwhere   = "WHERE ge.id = ce.entryid AND ce.categoryid = $hook AND
                                  ce.categoryid = c.id AND ge.approved != 0 AND