From fc5ef85ec2fa45afb44795109899d93329f7b2c4 Mon Sep 17 00:00:00 2001 From: brettp Date: Fri, 16 Apr 2010 01:56:18 +0000 Subject: Merged [5623]:head from 1.7 to trunk. git-svn-id: http://code.elgg.org/elgg/trunk@5760 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/elgglib.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'engine/lib/elgglib.php') diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index 0cb696e1d..77cc0d3a1 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -752,6 +752,11 @@ function elgg_view_annotation(ElggAnnotation $annotation, $bypass = true, $debug function elgg_view_entity_list($entities, $count, $offset, $limit, $fullview = true, $viewtypetoggle = true, $pagination = true) { $count = (int) $count; $limit = (int) $limit; + + // do not require views to explicitly pass in the offset + if (!$offset = (int) $offset) { + $offset = sanitise_int(get_input('offset', 0)); + } // do not require views to explicitly pass in the offset if (!$offset = (int) $offset) { -- cgit v1.2.3