Glossary extended search fixed. MDL-13947 ; merged from 19_STABLE

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 842be5cf14f72574b419ed7e03b0b7684744bb22..7b41ebb02fa88b35f9fe96531b69762f9485d938 100644 (file)
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -1066,13 +1066,11 @@ function glossary_search($course, $searchterms, $extended = 0, $glossary = NULL)
         }
     }
 
-    if ( !$extended ) {
-        $definitionsearch = "0";
-    }
+    $definitionsearch = !empty($extended) ? "OR $definitionsearch" : '';
 
     $selectsql = "{$CFG->prefix}glossary_entries e,
                   {$CFG->prefix}glossary g $onlyvisibletable
-             WHERE ($conceptsearch OR $definitionsearch)
+             WHERE ($conceptsearch $definitionsearch)
                AND (e.glossaryid = g.id or e.sourceglossaryid = g.id) $onlyvisible
                AND g.id IN ($glos) AND e.approved != 0";