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
This commit is contained in:
stronk7 2004-05-12 18:44:15 +00:00
parent 2a2525257f
commit 465e3ae35d

View file

@ -170,9 +170,8 @@
case 'term': case 'term':
$printpivot = 0; $printpivot = 0;
$sqlfrom .= ", {$CFG->prefix}glossary_alias ga"; $sqlfrom .= " left join {$CFG->prefix}glossary_alias ga on ge.id = ga.entryid ";
$where = "AND ge.id = ga.entryid AND $where = "AND (ge.concept = '$hook' OR ga.alias = '$hook' )
(ge.concept = '$hook' OR ga.alias = '$hook' )
"; ";
break; break;
@ -211,6 +210,7 @@
break; break;
} }
$count = count_records_sql("select count(*) $sqlfrom $sqlwhere"); $count = count_records_sql("select count(*) $sqlfrom $sqlwhere");
$sqllimit = ''; $sqllimit = '';
if ( $offset >= 0 ) { if ( $offset >= 0 ) {
@ -225,5 +225,4 @@
} }
$allentries = get_records_sql("$sqlselect $sqlfrom $sqlwhere $sqlorderby $sqllimit"); $allentries = get_records_sql("$sqlselect $sqlfrom $sqlwhere $sqlorderby $sqllimit");
?>
?>