Fix missing "perpage" variable transition

diff --git a/include/admin/comments.inc.php b/include/admin/comments.inc.php
index b7898cd9f6a51fd5469bad8a31d5d2579a449e3c..324a35fba56779fe77cafae2a7c189741ed12a4c 100644 (file)
--- a/include/admin/comments.inc.php
+++ b/include/admin/comments.inc.php
@@ -10,7 +10,7 @@ if (!serendipity_checkPermission('adminComments')) {
     return;
 }
 
-$commentsPerPage = (!empty($serendipity['GET']['filter']['perpage']) ? $serendipity['GET']['filter']['perpage'] : 10);
+$commentsPerPage = (int)(!empty($serendipity['GET']['filter']['perpage']) ? $serendipity['GET']['filter']['perpage'] : 10);
 $summaryLength = 200;
 
 if ( $serendipity['POST']['formAction'] == 'multiDelete' && sizeof($serendipity['POST']['delete']) != 0 && serendipity_checkFormToken()) {
@@ -114,7 +114,7 @@ if ( isset($serendipity['GET']['adminAction']) && $serendipity['GET']['adminActi
 $filters = array('author', 'email', 'ip', 'url', 'body', 'referer');
 
 /* Compress the filters into an "AND" SQL query, and a querystring */
-foreach ( $filters as $filter ) {
+foreach ($filters as $filter) {
     $and          .= (!empty($serendipity['GET']['filter'][$filter]) ? "AND c.". $filter ." LIKE '%". serendipity_db_escape_string($serendipity['GET']['filter'][$filter]) ."%'" : "");
     $searchString .= (!empty($serendipity['GET']['filter'][$filter]) ? "&serendipity[filter][". $filter ."]=". $serendipity['GET']['filter'][$filter] : "");
 }
@@ -139,6 +139,20 @@ if ($serendipity['GET']['filter']['type'] == 'TRACKBACK') {
     $c_type = null;
 }
 
+if ($serendipity['GET']['filter']['type'] == 'TRACKBACK') {
+    $c_type = 'TRACKBACK';
+    $searchString .= "&serendipity[filter][type]=TRACKBACK";
+} elseif ($serendipity['GET']['filter']['type'] == 'NORMAL') {
+    $c_type = 'NORMAL';
+    $searchString .= "&serendipity[filter][type]=NORMAL";
+} else {
+    $c_type = null;
+}
+
+if ($commentsPerPage != 10) {
+    $searchString .= '&serendipity[filter][perpage]=' . $commentsPerPage;
+}
+
 $searchString .= '&' . serendipity_setFormToken('url');
 
 /* Paging */