From 09d2029b6c943e542ae5ddf0a5b890ab92355b0f Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Tue, 11 Jan 2022 17:18:52 +0000
Subject: [PATCH] Prevent NPE when viewing non-rendered files (#18234)
Fix #18231
Signed-off-by: Andrew Thornton <art27@cantab.net>
---
templates/repo/unicode_escape_prompt.tmpl | 34 ++++++++++++++++---------------
1 file changed, 18 insertions(+), 16 deletions(-)
diff --git a/templates/repo/unicode_escape_prompt.tmpl b/templates/repo/unicode_escape_prompt.tmpl
index d45df012e1..855d7866a3 100644
--- a/templates/repo/unicode_escape_prompt.tmpl
+++ b/templates/repo/unicode_escape_prompt.tmpl
@@ -1,17 +1,19 @@
-{{if .EscapeStatus.BadBIDI}}
-<div class="ui error message unicode-escape-prompt">
- <span class="close icon hide-panel button" data-panel-closest=".message">{{svg "octicon-x" 16 "close inside"}}</span>
- <div class="header">
- {{$.root.i18n.Tr "repo.bidi_bad_header"}}
- </div>
- <p>{{$.root.i18n.Tr "repo.bidi_bad_description" | Str2html}}</p>
-</div>
-{{else if .EscapeStatus.Escaped}}
-<div class="ui warning message unicode-escape-prompt">
- <span class="close icon hide-panel button" data-panel-closest=".message">{{svg "octicon-x" 16 "close inside"}}</span>
- <div class="header">
- {{$.root.i18n.Tr "repo.unicode_header"}}
- </div>
- <p>{{$.root.i18n.Tr "repo.unicode_description" | Str2html}}</p>
-</div>
+{{if .EscapeStatus}}
+ {{if .EscapeStatus.BadBIDI}}
+ <div class="ui error message unicode-escape-prompt">
+ <span class="close icon hide-panel button" data-panel-closest=".message">{{svg "octicon-x" 16 "close inside"}}</span>
+ <div class="header">
+ {{$.root.i18n.Tr "repo.bidi_bad_header"}}
+ </div>
+ <p>{{$.root.i18n.Tr "repo.bidi_bad_description" | Str2html}}</p>
+ </div>
+ {{else if .EscapeStatus.Escaped}}
+ <div class="ui warning message unicode-escape-prompt">
+ <span class="close icon hide-panel button" data-panel-closest=".message">{{svg "octicon-x" 16 "close inside"}}</span>
+ <div class="header">
+ {{$.root.i18n.Tr "repo.unicode_header"}}
+ </div>
+ <p>{{$.root.i18n.Tr "repo.unicode_description" | Str2html}}</p>
+ </div>
+ {{end}}
{{end}}