From 80c2a742b6dc60cd7c1bbf1f6048b7152a3e5c44 Mon Sep 17 00:00:00 2001 From: Eloy Lafuente Date: Wed, 17 Nov 2010 21:47:08 +0000 Subject: [PATCH] MDL-21437 data - fixed navigation from list to single --- mod/data/view.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mod/data/view.php b/mod/data/view.php index 8498aad0022..818bceb48fe 100755 --- a/mod/data/view.php +++ b/mod/data/view.php @@ -570,7 +570,6 @@ if ($showactivity) { $fromsql = "FROM $tables $advtables $where $advwhere $groupselect $approveselect $searchselect $advsearchselect"; $sqlselect = "SELECT $what $fromsql $sortorder"; $sqlcount = "SELECT $count $fromsql"; // Total number of records when searching - $sqlrids = "SELECT tmp.id FROM ($sqlselect) tmp"; $sqlmax = "SELECT $count FROM $tables $where $groupselect $approveselect"; // number of all recoirds user may see $allparams = array_merge($params, $advparams); @@ -588,8 +587,8 @@ if ($showactivity) { $mode = 'single'; $page = 0; - if ($allrecordids = $DB->get_records_sql($sqlrids, $allparams)) { - $allrecordids = array_keys($allrecordids); + // TODO: Improve this because we are executing $sqlselect twice (here and some lines below)! + if ($allrecordids = $DB->get_fieldset_sql($sqlselect, $allparams)) { $page = (int)array_search($record->id, $allrecordids); unset($allrecordids); }