Minor formatting
Remove useless else...return
Merge pull request #5777 from lucasmichot/4.2-pagination-fragment

[4.2] Pagination : minor formatting
merging and fixing conflicts.