1 files changed, 15 insertions, 8 deletions
diff --git a/views/default/navigation/pagination.php b/views/default/navigation/pagination.php
index bba122d5a..875579802 100644
--- a/views/default/navigation/pagination.php
+++ b/views/default/navigation/pagination.php
@@ -42,6 +42,9 @@
 	$currentpage = ceil($offset / $limit) + 1;
 
 	$baseurl = preg_replace('/[\&\?]'.$word.'\=[0-9]*/',"",$vars['baseurl']);
+	
+	//only display if there is content to paginate through
+	if ($count >= $limit){
 
 ?>
 
@@ -49,15 +52,15 @@
 	<p>
 <?php
 
-	if ($count == 0) {
+	//if ($count == 0) {
 		
-		static $notfounddisplayed;
-		if (!isset($notfounddisplayed) && $nonefound) {
-			echo elgg_echo("notfound");
-			$notfounddisplayed = true;
-		}
+	//	static $notfounddisplayed;
+	//	if (!isset($notfounddisplayed) && $nonefound) {
+	//		echo elgg_echo("notfound");
+	//		$notfounddisplayed = true;
+	//	}
 		
-	}
+	//}
 
 	if ($offset > 0) {
 		
@@ -146,4 +149,8 @@
 
 ?>
 	</p>
-</div>
-\ No newline at end of file
+</div>
+
+<?php
+    } // end of pagination check if statement
+?>
+\ No newline at end of file