L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-54844 mod_glossary: Limiting of glossary searching.

Browse Source 
Searching of the glossary was returning results from all
glossaries on the site. It has now been returned to just
the glossary that you are currently viewing.
This commit is contained in:
Adrian Greeve
2016-07-06 09:20:31 +08:00
committed by Mr. Jenkins (CiBoT)
parent 8d30e8370d
commit ec0edd25ac
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/glossary/lib.php
+9 -2
View File
@@ -3653,10 +3653,11 @@ function glossary_get_categories($glossary, $from, $limit) {
*
* @param array $terms Array of terms.
* @param bool $fullsearch Whether or not full search should be enabled.
* @param int $glossaryid The ID of a glossary to reduce the search results.
* @return array The first element being the where clause, the second array of parameters.
* @since Moodle 3.1
*/
function glossary_get_search_terms_sql(array $terms, $fullsearch = true) {
function glossary_get_search_terms_sql(array $terms, $fullsearch = true, $glossaryid = null) {
global $DB;
static $i = 0;
@@ -3707,6 +3708,12 @@ function glossary_get_search_terms_sql(array $terms, $fullsearch = true) {
}
}
// Reduce the search results by restricting it to one glossary.
if (isset($glossaryid)) {
$conditions[] = 'AND ge.glossaryid = :glossaryid';
$params['glossaryid'] = $glossaryid;
}
// When there are no conditions we add a negative one to ensure that we don't return anything.
if (empty($conditions)) {
$conditions[] = '1 = 2';
@@ -3746,7 +3753,7 @@ function glossary_get_entries_by_search($glossary, $context, $query, $fullsearch
}
}
list($searchcond, $params) = glossary_get_search_terms_sql($terms, $fullsearch);
list($searchcond, $params) = glossary_get_search_terms_sql($terms, $fullsearch, $glossary->id);
$userfields = user_picture::fields('u', null, 'userdataid', 'userdata');