mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity

MDL-49231 mod_glossary: Reverting back to not using recordsets

Browse Source
This commit is contained in:
Frederic Massart 2016-01-05 12:55:18 +08:00
parent 2becd930f9
commit 5eabb5e76e
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mod/glossary/classes/external.php
View File

@ -491,7 +491,6 @@ class mod_glossary_external extends external_api {
self::fill_entry_details($record, $context);
$entries[] = $record;
}
$records->close();
return array(
'count' => $count,
@ -589,7 +588,6 @@ class mod_glossary_external extends external_api {
self::fill_entry_details($record, $context);
$entries[] = $record;
}
$records->close();
return array(
'count' => $count,
@ -767,7 +765,6 @@ class mod_glossary_external extends external_api {
}
$entries[] = $record;
}
$records->close();
return array(
'count' => $count,
@ -962,7 +959,6 @@ class mod_glossary_external extends external_api {
self::fill_entry_details($record, $context);
$entries[] = $record;
}
$records->close();
return array(
'count' => $count,
@ -1066,7 +1062,6 @@ class mod_glossary_external extends external_api {
self::fill_entry_details($record, $context);
$entries[] = $record;
}
$records->close();
return array(
'count' => $count,
@ -1168,7 +1163,6 @@ class mod_glossary_external extends external_api {
self::fill_entry_details($record, $context);
$entries[] = $record;
}
$records->close();
return array(
'count' => $count,
@ -1249,7 +1243,6 @@ class mod_glossary_external extends external_api {
self::fill_entry_details($record, $context);
$entries[] = $record;
}
$records->close();
return array(
'count' => $count,
@ -1336,7 +1329,6 @@ class mod_glossary_external extends external_api {
self::fill_entry_details($record, $context);
$entries[] = $record;
}
$records->close();
return array(
'count' => $count,

20
mod/glossary/lib.php
View File

@ -3386,7 +3386,7 @@ function glossary_get_entries_by_letter($glossary, $context, $letter, $from, $li
// Fetching the entries.
$count = $qb->count_records();
$entries = $qb->get_recordset();
$entries = $qb->get_records();
return array($entries, $count);
}
@ -3429,7 +3429,7 @@ function glossary_get_entries_by_date($glossary, $context, $order, $sort, $from,
// Fetching the entries.
$count = $qb->count_records();
$entries = $qb->get_recordset();
$entries = $qb->get_records();
return array($entries, $count);
}
@ -3459,6 +3459,12 @@ function glossary_get_entries_by_category($glossary, $context, $categoryid, $fro
$qb->join_category($categoryid);
$qb->join_user();
// The first field must be the relationship ID when viewing all categories.
if ($categoryid === GLOSSARY_SHOW_ALL_CATEGORIES) {
$qb->add_field('id', 'entries_categories', 'cid');
}
$qb->add_field('*', 'entries');
$qb->add_field('categoryid', 'entries_categories');
$qb->add_user_fields();
@ -3478,7 +3484,7 @@ function glossary_get_entries_by_category($glossary, $context, $categoryid, $fro
// Fetching the entries.
$count = $qb->count_records();
$entries = $qb->get_recordset();
$entries = $qb->get_records();
return array($entries, $count);
}
@ -3526,7 +3532,7 @@ function glossary_get_entries_by_author($glossary, $context, $letter, $field, $s
// Fetching the entries.
$count = $qb->count_records();
$entries = $qb->get_recordset();
$entries = $qb->get_records();
return array($entries, $count);
}
@ -3574,7 +3580,7 @@ function glossary_get_entries_by_author_id($glossary, $context, $authorid, $orde
// Fetching the entries.
$count = $qb->count_records();
$entries = $qb->get_recordset();
$entries = $qb->get_records();
return array($entries, $count);
}
@ -3817,7 +3823,7 @@ function glossary_get_entries_by_term($glossary, $context, $term, $from, $limit,
// Fetching the entries.
$count = $qb->count_records();
$entries = $qb->get_recordset();
$entries = $qb->get_records();
return array($entries, $count);
}
@ -3861,7 +3867,7 @@ function glossary_get_entries_to_approve($glossary, $context, $letter, $order, $
// Fetching the entries.
$count = $qb->count_records();
$entries = $qb->get_recordset();
$entries = $qb->get_records();
return array($entries, $count);
}