Merge branch 'master' of github.com:knadh/listmonk

knadh · Jan 19, 2020 · 1064f1e · 1064f1e
2 parents 6681f18 + e230bac
commit 1064f1e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ Alternatively, to run a demo of listmonk, you can quickly spin up a container `d
 - Fast bulk subscriber import
 - Custom subscriber attributes
 - Subscriber querying and segmentation with ad-hoc SQL
-- Rich Go templates and WYSIWYG editor
+- Rich Go HTML templates and WYSIWYG editor
 - Media gallery
 - Multi-threaded multi-SMTP e-mail queues for fast campaign delivery
 - HTTP/JSON APIs for everything

diff --git a/handlers.go b/handlers.go
@@ -186,8 +186,8 @@ func getPagination(q url.Values) pagination {
 		perPage = 0
 	} else {
 		ppi, _ := strconv.Atoi(pp)
-		if ppi < 1 || ppi > maxPerPage {
-			perPage = defaultPerPage
+		if ppi > 0 && ppi <= maxPerPage {
+			perPage = ppi
 		}
 	}