[whimsy] branch master updated: Move template.txt to parent dir

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new fb2f383  Move template.txt to parent dir
fb2f383 is described below

commit fb2f383967a423209495fee93d72fa6a2e802db2
Author: Sebb <se...@apache.org>
AuthorDate: Sun Jun 28 15:00:32 2020 +0100

    Move template.txt to parent dir
---
 www/officers/coi.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/officers/coi.cgi b/www/officers/coi.cgi
index 2b3c26d..9ee2cad 100755
--- a/www/officers/coi.cgi
+++ b/www/officers/coi.cgi
@@ -9,9 +9,10 @@ require 'date'
 require 'tmpdir'
 
 coi_url = ASF::SVN.svnurl('conflict-of-interest')
+COI_CURRENT_TEMPLATE_URL = File.join(coi_url, 'template.txt').untaint
+
 YEAR = DateTime.now.strftime "%Y"
 COI_CURRENT_URL = File.join(coi_url, YEAR).untaint
-COI_CURRENT_TEMPLATE_URL = File.join(COI_CURRENT_URL, 'template.txt')
 
 user = ASF::Person.find($USER)
 USERID = user.id