Fix paginator with uglyurls

Fixes #1120

diff --git a/hugolib/pagination.go b/hugolib/pagination.go
index 8210ca9456107fc192a6245c82a3ad594a046609..5c477bd5f67a70ef8234afd279b5f10dfaf5db28 100644 (file)
--- a/hugolib/pagination.go
+++ b/hugolib/pagination.go
@@ -23,6 +23,7 @@ import (
        "math"
        "path"
        "reflect"
+       "strings"
 )
 
 type Pager struct {
@@ -268,6 +269,8 @@ func paginatePages(seq interface{}, pagerSize int, section string) (pagers, erro
                return nil, err
        }
 
+       section = strings.TrimSuffix(section, ".html")
+
        urlFactory := newPaginationURLFactory(section)
        paginator, _ := newPaginator(pages, pagerSize, urlFactory)
        pagers := paginator.Pagers()

diff --git a/hugolib/pagination_test.go b/hugolib/pagination_test.go
index 5d7dcc3e5470488e4f63666ca3120ad8dc0950f8..e76709fdbf4cbec78adfc67f9db1d99b9176cfd9 100644 (file)
--- a/hugolib/pagination_test.go
+++ b/hugolib/pagination_test.go
@@ -172,7 +172,6 @@ func TestPaginate(t *testing.T) {
 }
 
 func doTestPaginate(t *testing.T, useViper bool) {
-
        pagerSize := 5
        if useViper {
                viper.Set("paginate", pagerSize)