From 2d5adf0e402df9793a52d5c22c3005d72ce1f231 Mon Sep 17 00:00:00 2001 From: Xin <5097752+imfing@users.noreply.github.com> Date: Thu, 5 Feb 2026 22:38:00 +0000 Subject: [PATCH] fix: prevent relref double base-prefix in render-link (#920) * Fix announcement relrefs and add doc * Revert glossary inline relref example * Fix relref links with subdirectory baseURL Co-authored-by: Max Mehl * Simplify relref base-prefix guard in render-link --------- Co-authored-by: Max Mehl --- docs/hugo.yaml | 8 ++++---- layouts/_markup/render-link.html | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/docs/hugo.yaml b/docs/hugo.yaml index 09ba9c6..2e428b8 100644 --- a/docs/hugo.yaml +++ b/docs/hugo.yaml @@ -32,7 +32,7 @@ languages: params: banner: message: | - هگزترا **v0.11** منتشر شد! 🎉 [تازه‌ها را ببینید]({{% ref "blog/v0.11" %}}) + هگزترا **v0.11** منتشر شد! 🎉 [تازه‌ها را ببینید]({{% relref "blog/v0.11" %}}) page: contextMenu: links: @@ -47,7 +47,7 @@ languages: params: banner: message: | - Hextra **v0.11** がリリースされました!🎉 [新着情報はこちら]({{% ref "blog/v0.11" %}}) + Hextra **v0.11** がリリースされました!🎉 [新着情報はこちら]({{% relref "blog/v0.11" %}}) page: contextMenu: links: @@ -62,7 +62,7 @@ languages: params: banner: message: | - Hextra **v0.11** 发布啦!🎉 查看[更新内容]({{% ref "blog/v0.11" %}}) + Hextra **v0.11** 发布啦!🎉 查看[更新内容]({{% relref "blog/v0.11" %}}) page: contextMenu: links: @@ -166,7 +166,7 @@ params: banner: key: 'announcement-v0.11' message: | - Hextra **v0.11** is here! 🎉 Discover [what's new]({{% ref "blog/v0.11" %}}) + Hextra **v0.11** is here! 🎉 Discover [what's new]({{% relref "blog/v0.11" %}}) navbar: displayTitle: true diff --git a/layouts/_markup/render-link.html b/layouts/_markup/render-link.html index 1de8f0f..ddcff5c 100644 --- a/layouts/_markup/render-link.html +++ b/layouts/_markup/render-link.html @@ -7,7 +7,10 @@ {{- $fragment := cond $url.Fragment (printf "#%s" $url.Fragment) "" -}} {{- $dest = printf "%s%s%s" .RelPermalink $query $fragment -}} {{- else -}} - {{- $dest = (relURL (strings.TrimPrefix "/" $dest)) -}} + {{- $hasBasePrefix := and (ne site.Home.RelPermalink "/") (hasPrefix $dest site.Home.RelPermalink) -}} + {{- if not $hasBasePrefix -}} + {{- $dest = (relURL (strings.TrimPrefix "/" $dest)) -}} + {{- end -}} {{- end -}} {{- end -}}