Closes #587: The area of code in question hasn't been coded as defencively as it could have been.

git-svn-id: https://code.elgg.org/elgg/trunk@2534 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 2 insertions, 2 deletions

diff --git a/views/default/navigation/pagination.php b/views/default/navigation/pagination.php
index 54fa3bdec..49275f053 100644
--- a/views/default/navigation/pagination.php
+++ b/views/default/navigation/pagination.php
@@ -17,10 +17,10 @@
 	} else {
 		$offset = $vars['offset'];
 	}
-	if (!isset($vars['limit'])) {
+	if ((!isset($vars['limit'])) || (!$limit)) {
 		$limit = 10;
 	} else {
-		$limit = $vars['limit'];
+		$limit = (int)$vars['limit'];
 	}
 	if (!isset($vars['count'])) {
 		$count = 0;