summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-11-18 07:03:25 -0500
committerChris McDonough <chrism@plope.com>2013-11-18 07:03:25 -0500
commit345694c8eb6dff9ef7375374c5032e53b764c1de (patch)
treee3a305a9ae0ac01f60ca4a362fa458720ab60f24 /docs/tutorials/wiki2
parent94b754aac45e235b5b11a60489395b77c8195fdc (diff)
parentc0a6d0ef43c681a83084523c63203e50a3c8607a (diff)
downloadpyramid-345694c8eb6dff9ef7375374c5032e53b764c1de.tar.gz
pyramid-345694c8eb6dff9ef7375374c5032e53b764c1de.tar.bz2
pyramid-345694c8eb6dff9ef7375374c5032e53b764c1de.zip
Merge branch '1.5-branch' of github.com:Pylons/pyramid into 1.5-branch
Diffstat (limited to 'docs/tutorials/wiki2')
-rw-r--r--docs/tutorials/wiki2/src/views/tutorial/views.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/tutorials/wiki2/src/views/tutorial/views.py b/docs/tutorials/wiki2/src/views/tutorial/views.py
index 42ef77b98..b41d4ab40 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/views.py
+++ b/docs/tutorials/wiki2/src/views/tutorial/views.py
@@ -1,3 +1,4 @@
+import cgi
import re
from docutils.core import publish_parts
@@ -32,10 +33,10 @@ def view_page(request):
exists = DBSession.query(Page).filter_by(name=word).all()
if exists:
view_url = request.route_url('view_page', pagename=word)
- return '<a href="%s">%s</a>' % (view_url, word)
+ return '<a href="%s">%s</a>' % (view_url, cgi.escape(word))
else:
add_url = request.route_url('add_page', pagename=word)
- return '<a href="%s">%s</a>' % (add_url, word)
+ return '<a href="%s">%s</a>' % (add_url, cgi.escape(word))
content = publish_parts(page.data, writer_name='html')['html_body']
content = wikiwords.sub(check, content)