Merge branch 'wip-MDL-33603-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE

2012-06-18 15:07:52 +08:00
parent 47e26d45f7 7040ab6e30
commit 1cdcf60ed3
1 changed files with 6 additions and 2 deletions
@@ -613,8 +613,12 @@ if ($showactivity) {
        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;