From: stronk7 <stronk7>
Date: Wed, 12 May 2004 18:44:15 +0000 (+0000)
Subject: Solved bug 985. Now "show" will work with aliases and with concepts
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=465e3ae35d8ba6914d6e2b59b80db0096b401a34;p=moodle.git

Solved bug 985. Now "show" will work with aliases and with concepts
with and without aliases. Changed the cuery to a left join to
be able to process entries without aliases. This type of operation
should be changed to boolean queries sometime in MySQL 4!!
Test it!!
http://moodle.org/bugs/bug.php?op=show&bugid=985
---

diff --git a/mod/glossary/sql.php b/mod/glossary/sql.php
index 9b818c8f7a..1daf3876ad 100644
--- a/mod/glossary/sql.php
+++ b/mod/glossary/sql.php
@@ -170,9 +170,8 @@
         
         case 'term': 
             $printpivot = 0;
-            $sqlfrom .= ", {$CFG->prefix}glossary_alias ga";
-            $where = "AND ge.id = ga.entryid AND                            
-                          (ge.concept = '$hook' OR ga.alias = '$hook' )
+            $sqlfrom .= " left join {$CFG->prefix}glossary_alias ga on ge.id = ga.entryid ";
+            $where = "AND (ge.concept = '$hook' OR ga.alias = '$hook' )
                      ";
         break;
 
@@ -211,6 +210,7 @@
     break;
     } 
     $count = count_records_sql("select count(*) $sqlfrom $sqlwhere");
+
     $sqllimit = '';
     
     if ( $offset >= 0 ) {
@@ -225,5 +225,4 @@
     }
     
     $allentries = get_records_sql("$sqlselect $sqlfrom $sqlwhere $sqlorderby $sqllimit");
-
-?>
\ No newline at end of file
+?>