diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-05-14 20:50:34 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-05-14 20:50:34 +0000 |
| commit | 0c2c36ff3b0329ff849930d0403f933653a84dcd (patch) | |
| tree | cdd859d225d68dcfa9603997f4c183eac8864900 /engine/lib/entities.php | |
| parent | b6aaba915151dd07800761a01b67ffffaee1302b (diff) | |
| download | elgg-0c2c36ff3b0329ff849930d0403f933653a84dcd.tar.gz elgg-0c2c36ff3b0329ff849930d0403f933653a84dcd.tar.bz2 | |
Merged 5928-6908 from 1.7 branch to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@6059 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/entities.php')
| -rw-r--r-- | engine/lib/entities.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/lib/entities.php b/engine/lib/entities.php index 481feac6b..8e20ec269 100644 --- a/engine/lib/entities.php +++ b/engine/lib/entities.php @@ -2319,8 +2319,8 @@ function elgg_get_entity_site_where_sql($table, $site_guids) { */ function elgg_list_entities($options) { $defaults = array( - 'offset' => 0, - 'limit' => 10, + 'offset' => (int) max(get_input('offset', 0), 0), + 'limit' => (int) max(get_input('limit', 10), 0), 'full_view' => TRUE, 'view_type_toggle' => FALSE, 'pagination' => TRUE |