From 4eafd9eb7b53ba76a15799ad8ab47f6739636cff Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Sun, 8 Mar 2026 13:38:38 +0100
Subject: [PATCH] tpl/tplimpl: Prefer early suffixes when media type matches

Fixes #13877
Close #14601

Co-Authored-By: Joe Mooring <joe.mooring@veriphor.com>
---
 hugolib/template_test.go     | 32 ++++++++++++++++++++++++++++++++
 tpl/tplimpl/templatestore.go | 22 ++++++++++++++++++++--
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/hugolib/template_test.go b/hugolib/template_test.go
index 1a03a41e5..90b8a575a 100644
--- a/hugolib/template_test.go
+++ b/hugolib/template_test.go
@@ -644,3 +644,35 @@ Overridden.
 
 	b.AssertFileContent("public/index.html", "Overridden.")
 }
+
+// Issue 13877
+func TestTemplateSelectionFirstMediaTypeSuffix(t *testing.T) {
+	t.Parallel()
+
+	files := `
+-- hugo.toml --
+disableKinds = ['home','rss','section','sitemap','taxonomy','term']
+
+[mediaTypes.'text/html']
+suffixes = ['b','a','d','c']
+
+[outputFormats.html]
+mediaType = 'text/html'
+-- content/p1.md --
+---
+title: p1
+---
+-- layouts/page.html.a --
+page.html.a
+-- layouts/page.html.b --
+page.html.b
+-- layouts/page.html.c --
+page.html.c
+-- layouts/page.html.d --
+page.html.d
+`
+
+	b := Test(t, files)
+
+	b.AssertFileContent("public/p1/index.b", "page.html.b")
+}
diff --git a/tpl/tplimpl/templatestore.go b/tpl/tplimpl/templatestore.go
index 1d4e537fd..57a0c4f69 100644
--- a/tpl/tplimpl/templatestore.go
+++ b/tpl/tplimpl/templatestore.go
@@ -29,6 +29,7 @@ import (
 	"path/filepath"
 	"reflect"
 	"regexp"
+	"slices"
 	"sort"
 	"strings"
 	"sync"
@@ -1271,8 +1272,25 @@ func (s *TemplateStore) insertTemplate2(
 
 	if !replace && existingFound {
 		if len(pi.Identifiers()) >= len(nkExisting.PathInfo.Identifiers()) {
-			// e.g. /pages/home.foo.html and  /pages/home.html where foo may be a valid language name in another site.
-			return nil, nil
+			if d.MediaType != "" && pi.Ext() != nkExisting.PathInfo.Ext() {
+				// Issue #13877: when multiple templates differ only in their file extension
+				// and both extensions are valid suffixes for the same media type,
+				// prefer the one whose extension matches an earlier suffix.
+				if mt, ok := s.opts.MediaTypes.GetByType(d.MediaType); ok {
+					suffixes := mt.Suffixes()
+					newIdx := slices.Index(suffixes, pi.Ext())
+					if newIdx != -1 {
+						existingIdx := slices.Index(suffixes, nkExisting.PathInfo.Ext())
+						if existingIdx == -1 || newIdx < existingIdx {
+							replace = true
+						}
+					}
+				}
+			}
+			if !replace {
+				// e.g. /pages/home.foo.html and  /pages/home.html where foo may be a valid language name in another site.
+				return nil, nil
+			}
 		}
 	}
 
-- 
2.39.5