Merge branch 'wip-MDL-33603-MOODLE_21_STABLE' of git://github.com/abg…

…reeve/moodle into MOODLE_21_STABLE
moodle · Jun 18, 2012 · 1cdcf60 · 1cdcf60
2 parents 47e26d4 + 7040ab6
commit 1cdcf60
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/mod/data/view.php b/mod/data/view.php
@@ -613,8 +613,12 @@
         if ($record) {     // We need to just show one, so where is it in context?
             $nowperpage = 1;
             $mode = 'single';
-            $page = (int)array_search($record->id, $recordids);
-
+            $page = 0;
+            // TODO MDL-33797 - Reduce this or consider redesigning the paging system.
+            if ($allrecordids = $DB->get_fieldset_sql($sqlselect, $allparams)) {
+                $page = (int)array_search($record->id, $allrecordids);
+                unset($allrecordids);
+            }
         } else if ($mode == 'single') {  // We rely on ambient $page settings
             $nowperpage = 1;