From d8e001922a50951ddca25a23c4c4c3933eeb8fa2 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Fri, 26 Mar 2021 21:44:13 +0000
Subject: [PATCH] fup: don't crash on view if we don't have a cheddar

Classic Go typed-nil bug.
---
 web/fup/cmd/serve.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/fup/cmd/serve.go b/web/fup/cmd/serve.go
index 04ef82c923..38f7d020b5 100644
--- a/web/fup/cmd/serve.go
+++ b/web/fup/cmd/serve.go
@@ -79,9 +79,11 @@ var (
 				AppRoot:             viper.GetString("serve.app-root"),
 				StorageURL:          bucketURL(),
 				RedirectToBlobstore: !viper.GetBool("serve.direct-only"),
-				Highlighter:         highlighter,
 				AuthMiddleware:      fuphttp.TokenAuthMiddleware(viper.GetString("serve.auth.token"), viper.GetString("serve.auth.realm")),
 			}
+			if highlighter != nil {
+				cfg.Highlighter = highlighter
+			}
 			a, err := fuphttp.New(ctx, cfg)
 			if err != nil {
 				return fmt.Errorf("constructing application: %w", err)