Commit 00ecfaadea2c40cc62b7a43e246384329e6ddb98

Parents: 907134b7a29177cb45aa461c549c004b1ae875af

From: Samuel Lidén Borell <samuel@kodafritt.se>
Date: Sat Jan 7 10:32:07 2023 +0700

config: make empty js= omit script tag 
According to the cgitrc man page, an empty js= value should cause the
script tag to be omitted. But instead, a script tag with an empty URL
is emitted. The same applies to css. So, skip emitting a tag if the
specified string is empty.

Signed-off-by: Samuel Lidén Borell <samuel@kodafritt.se>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

Stats

ui-shared.c +8/-0

Changeset

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26

diff --git a/ui-shared.c b/ui-shared.c
index 11aed19a80e882c6999eecb32250cd206fee5210..baea6f2c84e9f168df4e29983e9593b1b2cf888a 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -770,6 +770,10 @@ }
 
 static int emit_css_link(struct string_list_item *s, void *arg)
 {
+	/* Do not emit anything if css= is specified. */
+	if (s && *s->string == '\0')
+		return 0;
+
 	html("<link rel='stylesheet' type='text/css' href='");
 	if (s)
 		html_attr(s->string);
@@ -782,6 +786,10 @@ }
 
 static int emit_js_link(struct string_list_item *s, void *arg)
 {
+	/* Do not emit anything if js= is specified. */
+	if (s && *s->string == '\0')
+		return 0;
+
 	html("<script type='text/javascript' src='");
 	if (s)
 		html_attr(s->string);