diff --git a/upload/config.php b/upload/config.php
index bac906f94..366b2c8d6 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -57,7 +57,7 @@ $bb_cfg['css_ver'] = 1;
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.1 Stable';
-$bb_cfg['tp_release_state'] = 'R260';
+$bb_cfg['tp_release_state'] = 'R261';
 $bb_cfg['tp_release_date'] = '28-08-2011';
 
 $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger
diff --git a/upload/includes/functions.php b/upload/includes/functions.php
index add2424f8..17d8ce56c 100644
--- a/upload/includes/functions.php
+++ b/upload/includes/functions.php
@@ -1732,7 +1732,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add
 
 	$total_pages = ceil($num_items/$per_page);
 
-	if ( $total_pages == 1 )
+	if ( $total_pages == 1 || $num_items == 0 )
 	{
 		return '';
 	}