diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-04-16 01:56:18 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-04-16 01:56:18 +0000 |
| commit | fc5ef85ec2fa45afb44795109899d93329f7b2c4 (patch) | |
| tree | 8d8f958ca42012c2ea753136859f54eda7796ab7 /engine/lib | |
| parent | f29b327342068543b8a2a3f0f487953468f3c9a5 (diff) | |
| download | elgg-fc5ef85ec2fa45afb44795109899d93329f7b2c4.tar.gz elgg-fc5ef85ec2fa45afb44795109899d93329f7b2c4.tar.bz2 | |
Merged [5623]:head from 1.7 to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@5760 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib')
| -rw-r--r-- | engine/lib/elgglib.php | 5 |
1 files changed, 5 insertions, 0 deletions
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) { |