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

This commit is contained in:
Kailash Nadh 2020-01-19 20:49:01 +05:30
commit 1064f1e4d8
2 changed files with 3 additions and 3 deletions

View File

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

View File

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