Merge pull request #661 from ElegantMonkey/fix-captcha

Fix captcha on upload page

templates/_captcha.html

@@ -1,4 +1,5 @@
 {{define "captcha"}}
+{{with .Upload}}
 	{{/* unset if user doesn't need captcha */}}
 	{{if ne .CaptchaID ""}}
 	<div class="form-group captcha-container">
@@ -9,3 +10,4 @@
 	</div>
 	{{end}}
 {{end}}
+{{end}}

templates/upload.html

@@ -78,7 +78,7 @@
           <input name="website_link" id="website_link" class="form-control" type="text" value="{{.WebsiteLink}}">
       </div>
 
-      {{block "captcha" .}}{{end}}
+      {{block "captcha" $}}{{end}}
 
       <button type="submit" class="btn btn-success">{{call $.T "upload"}}</button>
       <br />