Merge branch 'master' into easy-forms

webcontroller/user_account.go

@@ -16,23 +16,7 @@ func (wc *WebController) serveRegister(
 	p httprouter.Params,
 ) {
 	var tpld = wc.newTemplateData(w, r)
-
-	// This only runs on the first request
-	if wc.captchaSiteKey == "" {
-		capt, err := tpld.PixelAPI.GetRecaptcha()
-		if err != nil {
-			log.Error("Error getting recaptcha key: %s", err)
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-		if capt.SiteKey == "" {
-			wc.captchaSiteKey = "none"
-		} else {
-			wc.captchaSiteKey = capt.SiteKey
-		}
-	}
-
-	tpld.Other = wc.captchaSiteKey
+	tpld.Other = wc.captchaKey()
 
 	err := wc.templates.Get().ExecuteTemplate(w, "register", tpld)
 	if err != nil {