Skip to content

Commit 3fc755a

Browse files
author
Richard Jones
committed
fix faulty find_template filename facility [SF#1163629]
1 parent d9d5c75 commit 3fc755a

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

CHANGES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Fixed:
2626
"debug" multiprocess mode (roundup-server) or the DEBUG_TO_CLIENT var
2727
(roundup.cgi) to have the errors appear in your browser
2828
- fix setgid typo (sf bug 1171346)
29+
- fix faulty find_template filename facility (sf bug 1163629)
2930

3031

3132
2005-03-03 0.8.2

doc/index.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ Nathaniel Smith,
143143
Maciej Starzyk,
144144
Mitchell Surface,
145145
Mike Thompson,
146+
Michael Twomey,
146147
Martin Uzak,
147148
Darryl VanDorp,
148149
J Vickroy,

roundup/cgi/templating.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ def find_template(dir, name, view):
8585

8686
# try with a .html or .xml extension (new-style)
8787
for extension in '.html', '.xml':
88-
filename = filename + extension
89-
src = os.path.join(dir, filename)
88+
f = filename + extension
89+
src = os.path.join(dir, f)
9090
if os.path.exists(src):
91-
return (src, filename)
91+
return (src, f)
9292

9393
# no view == no generic template is possible
9494
if not view:

0 commit comments

Comments
 (0)