diff options
| author | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 05:20:43 +0100 |
|---|---|---|
| committer | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 05:20:43 +0100 |
| commit | 71b9468677051a2df4efd8ace39e7743bd53210d (patch) | |
| tree | 44b76c7fef1eda39a7b771a3a82f8163280f06aa | |
| parent | 683534393feec432eb2fe9b8931c1187133a83d1 (diff) | |
| download | troggle-71b9468677051a2df4efd8ace39e7743bd53210d.tar.gz troggle-71b9468677051a2df4efd8ace39e7743bd53210d.tar.bz2 troggle-71b9468677051a2df4efd8ace39e7743bd53210d.zip | |
[svn] Use URL_ROOT for links
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8074 by julian @ 11/7/2008 9:12 AM
| -rw-r--r-- | expo/templatetags/wiki_markup.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/expo/templatetags/wiki_markup.py b/expo/templatetags/wiki_markup.py index e2a9d7e..1b08efa 100644 --- a/expo/templatetags/wiki_markup.py +++ b/expo/templatetags/wiki_markup.py @@ -2,6 +2,7 @@ from django import template from django.utils.html import conditional_escape
from django.template.defaultfilters import stringfilter
from django.utils.safestring import mark_safe
+import settings
import re
register = template.Library()
@@ -54,7 +55,7 @@ def wiki_to_html_short(value, autoescape=None): value = re.sub("'''([^']+)'''", r"<b>\1</b>", value, re.DOTALL)
value = re.sub("''([^']+)''", r"<i>\1</i>", value, re.DOTALL)
#make cave links
- value = re.sub("\[\[\s*cave:([^\s]+)\s*\s*\]\]", r'<a href="/troggle/cave/\1/">\1</a>', value, re.DOTALL)
+ value = re.sub("\[\[\s*cave:([^\s]+)\s*\s*\]\]", r'<a href="%s/troggle/cave/\1/">\1</a>' % settings.URL_ROOT, value, re.DOTALL)
#Make lists from lines starting with lists of [stars and hashes]
outValue = ""
listdepth = []
|